nixpkgs-suyu/pkgs/top-level/all-packages.nix

4988 lines
138 KiB
Nix
Raw Normal View History

/* This file composes the Nix Packages collection. That is, it
imports the functions that build the various packages, and calls
them with appropriate arguments. The result is a set of all the
packages in the Nix Packages collection for some particular
platform. */
{ # The system (e.g., `i686-linux') for which to build the packages.
system ? __currentSystem
# Usually, the system type uniquely determines the stdenv and thus
# how to build the packages. But on some platforms we have
# different stdenvs, leading to different ways to build the
# packages. For instance, on Windows we support both Cygwin and
# Mingw builds. In both cases, `system' is `i686-cygwin'. The
# attribute `stdenvType' is used to select the specific kind of
# stdenv to use, e.g., `i686-mingw'.
, stdenvType ? system
, # The standard environment to use. Only used for bootstrapping. If
# null, the default standard environment is used.
bootStdenv ? null
# More flags for the bootstrapping of stdenv.
, noSysDirs ? true
, gccWithCC ? true
, gccWithProfiling ? true
}:
rec {
### Symbolic names.
x11 = xlibsWrapper;
# `xlibs' is the set of X library components. This used to be the
# old modular X libraries project (called `xlibs') but now it's just
# the set of packages in the modular X.org tree (which also includes
# non-library components like the server, drivers, fonts, etc.).
xlibs = xorg // {xlibs = xlibsWrapper;};
### Helper functions.
# Override the compiler in stdenv for specific packages.
overrideGCC = stdenv: gcc: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
};
# Add some arbitrary packages to buildInputs for specific packages.
# Used to override packages in stenv like Make. Should not be used
# for other dependencies.
overrideInStdenv = stdenv: pkgs: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args //
{ buildInputs = (if args ? buildInputs then args.buildInputs else []) ++ pkgs; }
);
};
addAttrsToDerivation = extraAttrs: stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // extraAttrs); };
# Override the setup script of stdenv. Useful for testing new
# versions of the setup script without causing a rebuild of
# everything.
#
# Example:
# randomPkg = import ../bla { ...
# stdenv = overrideSetup stdenv ../stdenv/generic/setup-latest.sh;
# };
overrideSetup = stdenv: setup: stdenv.regenerate setup;
# Return a modified stdenv that uses dietlibc to create small
# statically linked binaries.
useDietLibC = stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // {
NIX_CFLAGS_LINK = "-static";
# libcompat.a contains some commonly used functions.
NIX_LDFLAGS = "-lcompat";
# These are added *after* the command-line flags, so we'll
# always optimise for size.
NIX_CFLAGS_COMPILE =
(if args ? NIX_CFLAGS_COMPILE then args.NIX_CFLAGS_COMPILE else "")
+ " -Os -s -D_BSD_SOURCE=1";
configureFlags =
(if args ? configureFlags then args.configureFlags else "")
+ " --disable-shared"; # brrr...
NIX_GCC = import ../build-support/gcc-wrapper {
inherit stdenv;
libc = dietlibc;
inherit (gcc) gcc binutils name nativeTools nativePrefix;
nativeLibc = false;
};
});
isDietLibC = true;
};
# Return a modified stdenv that tries to build statically linked
# binaries.
makeStaticBinaries = stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // {
NIX_CFLAGS_LINK = "-static";
configureFlags =
(if args ? configureFlags then args.configureFlags else "")
+ " --disable-shared"; # brrr...
});
};
# Applying this to an attribute set will cause nix-env to look
# inside the set for derivations.
recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;};
useFromStdenv = hasIt: it: alternative: if hasIt then it else alternative;
lib = library;
library = import ../lib;
lib_unstable = import ../lib/default-unstable.nix;
# Return an attribute from the Nixpkgs configuration file, or
# a default value if the attribute doesn't exist.
getConfig = attrPath: default: library.getAttr attrPath default config;
# Return user-choosen version of given package. If you define package as
#
# pkgname_alts =
# {
# v_0_1 = ();
# v_0_2 = ();
# default = v_0_1;
# recurseForDerivations = true;
# };
# pkgname = getVersion "name" pkgname_alts;
#
# user will be able to write in his configuration.nix something like
# name = { version = "0.2"; }; and pkgname will be equal
# to getAttr pkgname_alts "0.2". Using alts.default by default.
getVersion = name: alts: builtins.getAttr
(getConfig [ name "version" ] "default") alts;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
# The same, another syntax.
# Warning: syntax for configuration.nix changed too
useVersion = name: f: f
{
version = getConfig [ "environment" "versions" name ];
};
# The contents of the configuration file found at $NIXPKGS_CONFIG or
# $HOME/.nixpkgs/config.nix.
config =
let {
toPath = builtins.toPath;
getEnv = x: if builtins ? getEnv then builtins.getEnv x else "";
pathExists = name:
builtins ? pathExists && builtins.pathExists (toPath name);
configFile = getEnv "NIXPKGS_CONFIG";
homeDir = getEnv "HOME";
configFile2 = homeDir + "/.nixpkgs/config.nix";
body =
if configFile != "" && pathExists configFile
then import (toPath configFile)
else if homeDir != "" && pathExists configFile2
then import (toPath configFile2)
else {};
};
# Change the symbolic name of a package for presentation purposes
# (i.e., so that nix-env users can tell them apart).
setName = name: drv: drv // {inherit name;};
updateName = updater: drv: drv // {name = updater (drv.name);};
# !!! the suffix should really be appended *before* the version, at
# least most of the time.
appendToName = suffix: updateName (name: "${name}-${suffix}");
# Decrease the priority of the package, i.e., other
# versions/variants will be preferred.
lowPrio = drv: drv // {
meta = (if drv ? meta then drv.meta else {}) // {priority = "10";};
};
mkDerivationByConfiguration =
assert builtins ? isAttrs;
{ flagConfig ? {}, optionals ? [], defaults ? []
, extraAttrs, collectExtraPhaseActions ? []
}:
args: with args.lib; with args;
if ( builtins.isAttrs extraAttrs ) then builtins.throw "the argument extraAttrs needs to be a function beeing passed co, but attribute set passed "
else
let co = lib_unstable.chooseOptionsByFlags { inherit args flagConfig optionals defaults collectExtraPhaseActions; }; in
args.stdenv.mkDerivation (
{
inherit (co) configureFlags buildInputs /*flags*/;
} // extraAttrs co // co.pass // co.flags_prefixed );
# Check absence of non-used options
checker = x: flag: opts: config:
(if flag then let result=(
(import ../build-support/checker)
opts config); in
(if (result=="") then x else
abort result)
else x);
builderDefs = lib.sumArgs (import ./builder-defs.nix) {
inherit stringsWithDeps lib stdenv writeScript;
};
stringsWithDeps = import ../lib/strings-with-deps.nix {
inherit stdenv lib;
};
# Call a specific version of a Nix expression, that is,
# `selectVersion ./foo {version = "0.1.2"; args...}' evaluates to
# `import ./foo/0.1.2.nix args'.
selectVersion = dir: args: import (dir + "/${args.version}.nix") args;
### STANDARD ENVIRONMENT
defaultStdenv =
(import ../stdenv {
inherit system stdenvType;
allPackages = import ./all-packages.nix;
}).stdenv;
stdenv =
if bootStdenv != null then bootStdenv else
let changer = getConfig ["replaceStdenv"] null;
in if changer != null then
changer {
stdenv = defaultStdenv;
overrideSetup = overrideSetup;
}
else defaultStdenv;
### BUILD SUPPORT
buildEnv = import ../build-support/buildenv {
inherit stdenv perl;
};
fetchcvs = import ../build-support/fetchcvs {
inherit stdenv cvs nix;
};
fetchdarcs = import ../build-support/fetchdarcs {
inherit stdenv darcs nix;
};
fetchsvn = import ../build-support/fetchsvn {
inherit stdenv subversion nix openssh;
sshSupport = true;
};
# TODO do some testing
fetchhg = import ../build-support/fetchhg {
inherit stdenv mercurial nix;
};
# Allow the stdenv to determine fetchurl, to cater for strange
# requirements.
fetchurl = useFromStdenv (stdenv ? fetchurl) stdenv.fetchurl
(import ../build-support/fetchurl {
inherit stdenv curl;
});
makeWrapper = ../build-support/make-wrapper/make-wrapper.sh;
# Run the shell command `buildCommand' to produce a store object
# named `name'. The attributes in `env' are added to the
# environment prior to running the command.
runCommand = name: env: buildCommand: stdenv.mkDerivation ({
inherit name buildCommand;
} // env);
# Write a plain text file to the Nix store. (The advantage over
# plain sources is that `text' can refer to the output paths of
# derivations, e.g., "... ${somePkg}/bin/foo ...".
writeText = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out";
writeScript = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out; chmod +x $out";
writeScriptBin = name: text: runCommand name {inherit text;} "mkdir -p \$out/bin; echo -n \"\$text\" > \$out/bin/\$name ; chmod +x \$out/bin/\$name";
stdenvNewSetupScript = stdenv;
substituteAll = import ../build-support/substitute/substitute-all.nix {
inherit stdenv;
};
nukeReferences = import ../build-support/nuke-references/default.nix {
inherit stdenv;
};
### TOOLS
aefs = import ../tools/security/aefs {
inherit fetchurl stdenv fuse;
};
amule = import ../tools/networking/p2p/amule {
inherit fetchurl stdenv zlib wxGTK;
};
axel = import ../tools/networking/axel {
inherit fetchurl stdenv;
};
azureus = import ../tools/networking/p2p/azureus {
inherit fetchurl stdenv jdk swt;
};
bc = import ../tools/misc/bc {
inherit fetchurl stdenv flex;
};
bibtextools = import ../tools/typesetting/bibtex-tools {
inherit fetchurl stdenv aterm tetex hevea sdf strategoxt;
};
bittorrent = import ../tools/networking/p2p/bittorrent {
inherit fetchurl stdenv makeWrapper python pycrypto twisted;
wxPython = wxPython26;
gui = true;
};
bittornado = import ../tools/networking/p2p/bit-tornado {
inherit fetchurl stdenv python wxPython26;
};
bsdiff = import ../tools/compression/bsdiff {
inherit fetchurl stdenv;
};
bzip2 = useFromStdenv (stdenv ? bzip2) stdenv.bzip2
(import ../tools/compression/bzip2 {
inherit fetchurl stdenv;
});
cabextract = import ../tools/archivers/cabextract {
inherit fetchurl stdenv;
};
chkrootkit = import ../tools/security/chkrootkit {
inherit fetchurl stdenv;
};
cksfv = import ../tools/networking/cksfv {
inherit fetchurl stdenv;
};
coreutils = useFromStdenv (stdenv ? coreutils) stdenv.coreutils
((if stdenv ? isDietLibC
then import ../tools/misc/coreutils-5
else import ../tools/misc/coreutils)
{
inherit fetchurl stdenv;
});
cpio = import ../tools/archivers/cpio {
inherit fetchurl stdenv;
};
cron = import ../tools/system/cron {
inherit fetchurl stdenv;
};
curl = if stdenv ? curl then stdenv.curl else (assert false; null);
curlftpfs = import ../tools/networking/curlftpfs {
inherit fetchurl stdenv fuse curl pkgconfig zlib;
inherit (gtkLibs) glib;
};
dnsmasq = import ../tools/networking/dnsmasq {
# TODO i18n can be installed as well, implement it?
inherit fetchurl stdenv;
};
dhcp = import ../tools/networking/dhcp {
inherit fetchurl stdenv groff nettools coreutils iputils gnused bash;
};
diffutils = useFromStdenv (stdenv ? diffutils) stdenv.diffutils
(import ../tools/text/diffutils {
inherit fetchurl stdenv coreutils;
});
ed = import ../tools/text/ed {
inherit fetchurl stdenv;
};
enscript = import ../tools/text/enscript {
inherit fetchurl stdenv;
};
eprover = import ../tools/misc/eProver {
inherit fetchurl stdenv which tetex;
};
exif = import ../tools/graphics/exif {
inherit fetchurl stdenv pkgconfig libexif popt;
};
file = import ../tools/misc/file {
inherit fetchurl stdenv;
};
filelight = import ../tools/system/filelight {
inherit fetchurl stdenv kdelibs x11 zlib
perl libpng;
qt = qt3;
};
findutils = useFromStdenv (stdenv ? findutils) stdenv.findutils
(if system == "i686-darwin" then findutils4227 else
import ../tools/misc/findutils {
inherit fetchurl stdenv coreutils;
}
);
findutils4227 = import ../tools/misc/findutils/4.2.27.nix {
inherit fetchurl stdenv coreutils;
};
findutilsWrapper = lowPrio (appendToName "wrapper" (import ../tools/misc/findutils-wrapper {
inherit stdenv findutils;
}));
fontforge = import ../tools/misc/fontforge {
inherit fetchurl stdenv gettext freetype zlib
libungif libpng libjpeg libtiff libxml2;
};
gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk
(import ../tools/text/gawk {
inherit fetchurl stdenv;
});
gdmapFun = lib.sumArgs (selectVersion ../tools/system/gdmap) {
inherit stdenv fetchurl builderDefs pkgconfig libxml2
intltool;
inherit (gtkLibs) gtk;
};
gdmap = gdmapFun {
version = "0.7.5";
} null;
getopt = import ../tools/misc/getopt {
inherit fetchurl stdenv;
};
glxinfo = assert mesaSupported; import ../tools/graphics/glxinfo {
inherit fetchurl stdenv x11 mesa;
inherit (xlibs) libXext;
};
gnugrep = useFromStdenv (stdenv ? gnugrep) stdenv.gnugrep
(import ../tools/text/gnugrep {
inherit fetchurl stdenv pcre;
});
gnupatch = useFromStdenv (stdenv ? patch) stdenv.patch (import ../tools/text/gnupatch {
inherit fetchurl stdenv;
});
gnupg = import ../tools/security/gnupg {
inherit fetchurl stdenv readline;
ideaSupport = true; # enable for IDEA crypto support
};
gnupg2 = import ../tools/security/gnupg2 {
inherit fetchurl stdenv readline openldap bzip2 zlib libgpgerror pth
libgcrypt libassuan libksba libusb curl;
};
gnuplot = import ../tools/graphics/gnuplot {
inherit fetchurl stdenv zlib gd texinfo;
};
gnuplotX = import ../tools/graphics/gnuplot {
inherit fetchurl stdenv zlib gd texinfo;
inherit (xlibs) libX11 libXt libXaw libXpm;
x11Support = true;
};
gnused = useFromStdenv (stdenv ? gnused) stdenv.gnused
(import ../tools/text/gnused {
inherit fetchurl stdenv;
});
gnused412 = import ../tools/text/gnused/4.1.2.nix {
inherit fetchurl stdenv;
};
gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar
(import ../tools/archivers/gnutar {
inherit fetchurl stdenv;
});
gnutar151 = import ../tools/archivers/gnutar/1.15.1.nix {
inherit fetchurl stdenv;
};
graphviz = import ../tools/graphics/graphviz {
inherit fetchurl stdenv libpng libjpeg expat x11 yacc libtool;
inherit (xlibs) libXaw;
};
groff = import ../tools/text/groff {
inherit fetchurl stdenv;
};
grub =
if system == "x86_64-linux" then
(import ./all-packages.nix {system = "i686-linux";}).grub
else
import ../tools/misc/grub {
inherit fetchurl stdenv autoconf automake;
};
gtkgnutella = import ../tools/networking/p2p/gtk-gnutella {
inherit fetchurl stdenv pkgconfig libxml2;
inherit (gtkLibs) glib gtk;
};
gzip = useFromStdenv (stdenv ? gzip) stdenv.gzip
(import ../tools/compression/gzip {
inherit fetchurl stdenv;
});
hddtemp = import ../tools/hddtemp {
inherit fetchurl stdenv;
};
hevea = import ../tools/typesetting/hevea {
inherit fetchurl stdenv ocaml;
};
/*hyppocampusFun = lib.sumArgs ( selectVersion ../tools/misc/hyppocampus ) {
inherit builderDefs stdenv fetchurl libdbi libdbiDrivers fuse
pkgconfig perl gettext dbus dbus_glib pcre libscd;
inherit (gtkLibs) glib;
bison = bison23;
flex = flex2533;
};
hyppocampus = hyppocampusFun {
version = "0.3rc1";
} null;*/
jdiskreport = import ../tools/misc/jdiskreport {
inherit fetchurl stdenv unzip jdk;
};
jing = import ../tools/text/xml/jing {
inherit fetchurl stdenv unzip;
};
jing_tools = import ../tools/text/xml/jing/jing-script.nix {
inherit fetchurl stdenv unzip jre;
};
jwhois = import ../tools/networking/jwhois {
inherit fetchurl stdenv;
};
ktorrent = import ../tools/networking/p2p/ktorrent {
inherit fetchurl stdenv pkgconfig kdelibs
xlibs zlib libpng libjpeg perl gmp;
};
less = import ../tools/misc/less {
inherit fetchurl stdenv ncurses;
};
lftp = import ../tools/networking/lftp {
inherit fetchurl stdenv readline;
};
lhs2tex = import ../tools/typesetting/lhs2tex {
inherit fetchurl stdenv ghc tetex polytable;
};
man = import ../tools/misc/man {
inherit fetchurl stdenv db4 groff;
};
memtest86 = import ../tools/misc/memtest86 {
inherit fetchurl stdenv;
};
mjpegtools = import ../tools/video/mjpegtools {
inherit fetchurl stdenv libjpeg;
inherit (xlibs) libX11;
};
mktemp = import ../tools/security/mktemp {
inherit fetchurl stdenv;
};
ncat = import ../tools/networking/ncat {
inherit fetchurl stdenv openssl;
};
netcat = import ../tools/networking/netcat {
inherit fetchurl stdenv;
};
netselect = import ../tools/networking/netselect {
inherit fetchurl stdenv;
};
nmap = import ../tools/security/nmap {
inherit fetchurl stdenv libpcap pkgconfig;
inherit (xlibs) libX11;
inherit (gtkLibs) gtk;
};
ntp = import ../tools/networking/ntp {
inherit fetchurl stdenv libcap;
};
openssh = import ../tools/networking/openssh {
inherit fetchurl stdenv zlib openssl pam perl;
pamSupport = true;
};
p7zip = import ../tools/archivers/p7zip {
inherit fetchurl stdenv;
};
par2cmdline = import ../tools/networking/par2cmdline {
inherit fetchurl;
stdenv = overrideGCC stdenv gcc34;
};
parted = import ../tools/misc/parted {
inherit fetchurl stdenv e2fsprogs readline;
};
patch = gnupatch;
* The stdenv setup script now defines a generic builder that allows builders for typical Autoconf-style to be much shorten, e.g., . $stdenv/setup genericBuild The generic builder does lots of stuff automatically: - Unpacks source archives specified by $src or $srcs (it knows about gzip, bzip2, tar, zip, and unpacked source trees). - Determines the source tree. - Applies patches specified by $patches. - Fixes libtool not to search for libraries in /lib etc. - Runs `configure'. - Runs `make'. - Runs `make install'. - Strips debug information from static libraries. - Writes nested log information (in the format accepted by `log2xml'). There are also lots of hooks and variables to customise the generic builder. See `stdenv/generic/docs.txt'. * Adapted the base packages (i.e., the ones used by stdenv) to use the generic builder. * We now use `curl' instead of `wget' to download files in `fetchurl'. * Neither `curl' nor `wget' are part of stdenv. We shouldn't encourage people to download stuff in builders (impure!). * Updated some packages. * `buildinputs' is now `buildInputs' (but the old name also works). * `findInputs' in the setup script now prevents inputs from being processed multiple times (which could happen, e.g., if an input was a propagated input of several other inputs; this caused the size variables like $PATH to blow up exponentially in the worst case). * Patched GNU Make to write nested log information in the format accepted by `log2xml'. Also, prior to writing the build command, Make now writes a line `building X' to indicate what is being built. This is unfortunately often obscured by the gigantic tool invocations in many Makefiles. The actual build commands are marked `unimportant' so that they don't clutter pages generated by `log2html'. svn path=/nixpkgs/trunk/; revision=845
2004-03-19 17:53:04 +01:00
pciutils = import ../tools/system/pciutils {
inherit fetchurl stdenv zlib;
};
pdfjam = import ../tools/typesetting/pdfjam {
inherit fetchurl stdenv;
};
ploticus = import ../tools/graphics/ploticus {
inherit fetchurl stdenv zlib libpng;
inherit (xlibs) libX11;
};
psmisc = import ../tools/misc/psmisc {
inherit stdenv fetchurl ncurses;
};
pwgen = import ../tools/security/pwgen {
inherit stdenv fetchurl;
};
qtparted = import ../tools/misc/qtparted {
inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib qt3;
inherit (xlibs) libX11 libXext;
};
realCurl = import ../tools/networking/curl {
inherit fetchurl stdenv zlib;
zlibSupport = !stdenv ? isDietLibC;
};
relfsFun = lib.sumArgs (selectVersion ../tools/misc/relfs) {
inherit fetchcvs stdenv ocaml postgresql fuse pcre
builderDefs e2fsprogs pkgconfig;
inherit (gnome) gnomevfs GConf;
};
relfs = relfsFun {
version = "cvs.2007.12.01";
} null;
replace = import ../tools/text/replace {
inherit fetchurl stdenv;
};
/*
rdiff_backup = import ../tools/backup/rdiff-backup {
inherit fetchurl stdenv librsync gnused;
python=python;
};
*/
rpm = import ../tools/package-management/rpm {
inherit fetchurl stdenv cpio zlib bzip2 file sqlite beecrypt neon elfutils;
};
sablotron = import ../tools/text/xml/sablotron {
inherit fetchurl stdenv expat;
};
screen = import ../tools/misc/screen {
inherit fetchurl stdenv ncurses;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
shebangfix = import ../tools/misc/shebangfix {
inherit perl stdenv;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
};
smartmontools = import ../tools/system/smartmontools {
inherit fetchurl stdenv;
};
sudo = import ../tools/security/sudo {
inherit fetchurl stdenv coreutils pam;
};
superkaramba = import ../desktops/superkaramba {
inherit stdenv fetchurl kdebase kdelibs zlib libjpeg
perl qt3 python libpng freetype expat;
inherit (xlibs) libX11 libXext libXt libXaw libXpm;
};
sshfsFuse = import ../tools/networking/sshfs-fuse {
inherit fetchurl stdenv pkgconfig fuse;
inherit (gtkLibs) glib;
};
ssmtp = import ../tools/networking/ssmtp {
inherit fetchurl stdenv openssl;
tlsSupport = true;
};
su = import ../tools/misc/su {
inherit fetchurl stdenv pam;
};
tcpdump = import ../tools/networking/tcpdump {
inherit fetchurl stdenv libpcap;
};
telnet = import ../tools/networking/telnet {
inherit fetchurl stdenv ncurses;
};
testdisk = import ../tools/misc/testdisk {
inherit fetchurl stdenv ncurses libjpeg e2fsprogs zlib openssl;
};
tightvnc = import ../tools/admin/tightvnc {
inherit fetchurl stdenv x11 zlib libjpeg perl;
inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp xauth;
};
time = import ../tools/misc/time {
inherit fetchurl stdenv;
};
trang = import ../tools/text/xml/trang {
inherit fetchurl stdenv unzip jre;
};
transfig = import ../tools/graphics/transfig {
inherit fetchurl stdenv libpng libjpeg zlib;
inherit (xlibs) imake;
};
units = import ../tools/misc/units {
inherit fetchurl stdenv;
};
unrar = import ../tools/archivers/unrar {
inherit fetchurl stdenv;
};
unshield = import ../tools/archivers/unshield {
inherit fetchurl stdenv zlib;
};
unzip = import ../tools/archivers/unzip {
inherit fetchurl stdenv;
};
wget = import ../tools/networking/wget {
inherit fetchurl stdenv gettext;
};
which = import ../tools/system/which {
inherit fetchurl stdenv;
};
wv = import ../tools/misc/wv {
inherit fetchurl stdenv libpng zlib imagemagick
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
pkgconfig libgsf libxml2 bzip2;
inherit (gtkLibs) glib;
};
x11_ssh_askpass = import ../tools/networking/x11-ssh-askpass {
inherit fetchurl stdenv x11;
inherit (xorg) imake;
};
xclip = import ../tools/misc/xclip {
inherit fetchurl stdenv x11;
inherit (xlibs) libXmu;
};
xmlroff = import ../tools/typesetting/xmlroff {
inherit fetchurl stdenv pkgconfig libxml2 libxslt popt;
inherit (gtkLibs) glib pango gtk;
inherit (gnome) libgnomeprint;
inherit pangoxsl;
};
xmltv = import ../tools/misc/xmltv {
inherit fetchurl perl perlTermReadKey perlXMLTwig perlXMLWriter
perlDateManip perlHTMLTree perlHTMLParser perlHTMLTagset
perlURI perlLWP;
};
xpf = import ../tools/text/xml/xpf {
inherit fetchurl stdenv python;
libxml2 = import ../development/libraries/libxml2 {
inherit fetchurl stdenv zlib python;
pythonSupport = true;
};
};
xsel = import ../tools/misc/xsel {
inherit fetchurl stdenv x11;
};
zdelta = import ../tools/compression/zdelta {
inherit fetchurl stdenv;
};
zip = import ../tools/archivers/zip {
inherit fetchurl stdenv;
};
### SHELLS
bash = lowPrio (useFromStdenv (stdenv ? bash) stdenv.bash
(import ../shells/bash {
inherit fetchurl stdenv;
bison = bison23;
}));
bashInteractive = appendToName "interactive" (import ../shells/bash {
inherit fetchurl ncurses stdenv;
bison = bison23;
interactive = true;
});
tcsh = import ../shells/tcsh {
inherit fetchurl stdenv ncurses;
};
zsh = import ../shells/zsh {
inherit fetchurl stdenv ncurses coreutils;
};
### DEVELOPMENT / COMPILERS
abc =
abcPatchable [];
abcPatchable = patches :
import ../development/compilers/abc/default.nix {
inherit stdenv fetchurl patches jre apacheAnt;
javaCup = import ../development/libraries/java/cup {
inherit stdenv fetchurl jdk;
};
};
aspectj =
import ../development/compilers/aspectj {
inherit stdenv fetchurl jre;
};
dylan = import ../development/compilers/gwydion-dylan {
inherit fetchurl stdenv perl boehmgc yacc flex readline;
dylan =
import ../development/compilers/gwydion-dylan/binary.nix {
inherit fetchurl stdenv;
};
};
fpc = import ../development/compilers/fpc {
inherit fetchurl stdenv gawk;
};
g77 = import ../build-support/gcc-wrapper {
name = "g77";
nativeTools = false;
nativeLibc = false;
gcc = import ../development/compilers/gcc-3.3 {
inherit fetchurl stdenv noSysDirs;
langF77 = true;
langCC = false;
};
inherit (stdenv.gcc) binutils libc;
inherit stdenv;
};
g77_40 = import ../build-support/gcc-wrapper {
name = "g77-4.0";
nativeTools = false;
nativeLibc = false;
gcc = import ../development/compilers/gcc-4.0 {
inherit fetchurl stdenv noSysDirs;
langF77 = true;
langCC = false;
inherit gmp mpfr;
};
inherit (stdenv.gcc) binutils libc;
inherit stdenv;
};
g77_41 = import ../build-support/gcc-wrapper {
name = "g77-4.1";
nativeTools = false;
nativeLibc = false;
gcc = import ../development/compilers/gcc-4.1 {
inherit fetchurl stdenv noSysDirs;
langF77 = true;
langCC = false;
langC = false;
inherit gmp mpfr;
};
inherit (stdenv.gcc) binutils libc;
inherit stdenv;
};
gcc = gcc42;
gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
inherit fetchurl stdenv noSysDirs;
});
gcc33 = wrapGCC (import ../development/compilers/gcc-3.3 {
inherit fetchurl stdenv noSysDirs;
});
gcc34 = wrapGCC (import ../development/compilers/gcc-3.4 {
inherit fetchurl stdenv noSysDirs;
});
gcc40 = wrapGCC (import ../development/compilers/gcc-4.0 {
inherit fetchurl stdenv noSysDirs;
profiledCompiler = true;
});
gcc41 = wrapGCC (import ../development/compilers/gcc-4.1 {
inherit fetchurl stdenv noSysDirs;
profiledCompiler = false;
});
gcc42 = useFromStdenv (stdenv ? gcc) stdenv.gcc (wrapGCC (import ../development/compilers/gcc-4.2 {
inherit fetchurl stdenv noSysDirs;
profiledCompiler = true;
}));
gccApple = wrapGCC (import ../development/compilers/gcc-apple {
inherit fetchurl stdenv noSysDirs;
profiledCompiler = true;
});
# This new ghc stuff is under heavy development and might change !
ghcPkgUtil = runCommand "ghcPkgUtil-internal"
{ ghcPkgUtil = ../development/libraries/haskell/generic/ghcPkgUtil.sh; }
"mkdir -p $out/nix-support; cp $ghcPkgUtil \$out/nix-support/setup-hook;";
ghcsAndLibs =
assert builtins ? listToAttrs;
recurseIntoAttrs (import ../development/compilers/ghcs {
inherit ghcboot fetchurl recurseIntoAttrs perl gnum4 gmp readline stdenv;
inherit ghcPkgUtil;
lib = lib_unstable;
});
# creates ghc-X-wl wich adds the passed libraries to the env var GHC_PACKAGE_PATH
createGhcWrapper = { ghcPackagedLibs ? false, ghc, libraries, name, suffix ? "ghc_wrapper_${ghc.name}" } :
import ../development/compilers/ghc/createGhcWrapper {
inherit ghcPackagedLibs ghc name suffix libraries ghcPkgUtil stdenv;
};
# the wrappers basically does one thing: It defines GHC_PACKAGE_PATH before calling ghc{i,-pkg}
# So you can have different wrappers with different library combinations
# So installing ghc libraries isn't done by nix-env -i package but by adding the lib to the libraries list below
ghcLibraryWrapper68 =
let ghc = ghcsAndLibs.ghc68.ghc; in
createGhcWrapper rec {
ghcPackagedLibs = true;
name = "ghc68_wrapper";
suffix = "68wrapper";
libraries = map ( a : __getAttr a ghcsAndLibs.ghc68.core_libs )
[ "old-locale-1.0" "old-time-1.0" "filepath-1.0" "directory-1.0" "array-0.1" "containers-0.1"
"hpc-0.5" "bytestring-0.9" "pretty-1.0" "packedstring-0.1" "template-haskell-0.1"
"unix-2.0" "process-1.0" "readline-1.0" "Cabal-1.2.0" "random-1.0" "haskell98-1.0" "ghc-6.8.0.20071004"
"array-0.1" "bytestring-0.9" "containers-0.1" "directory-1.0" "filepath-1.0"
"ghc-6.8.0.20071004" "haskell98-1.0" "hpc-0.5" "old-locale-1.0" "old-time-1.0"
"packedstring-0.1" "pretty-1.0" "process-1.0" "random-1.0"
"readline-1.0" "rts-1.0" "template-haskell-0.1" "unix-2.0"
];
# (flatten ghcsAndLibs.ghc68.core_libs);
inherit ghc;
};
# ghc66boot = import ../development/compilers/ghc-6.6-boot {
# inherit fetchurl stdenv perl readline;
# m4 = gnum4;
#};
ghc = ghc661;
ghc68 = import ../development/compilers/ghc-6.8 {
inherit fetchurl stdenv readline perl gmp ncurses;
m4 = gnum4;
ghc = ghcboot;
};
ghc661 = import ../development/compilers/ghc-6.6.1 {
inherit fetchurl stdenv readline perl gmp ncurses;
m4 = gnum4;
ghc = ghcboot;
};
ghc66 = import ../development/compilers/ghc-6.6 {
inherit fetchurl stdenv readline perl gmp ncurses;
m4 = gnum4;
ghc = ghcboot;
};
ghc64 = import ../development/compilers/ghc {
inherit fetchurl stdenv perl ncurses readline m4 gmp;
gcc = stdenv.gcc;
ghc = ghcboot;
};
ghcboot = lowPrio (appendToName "boot" (import ../development/compilers/ghc/boot.nix {
inherit fetchurl stdenv perl ncurses gmp;
readline = if stdenv.system == "i686-linux" then readline4 else readline;
}));
/*
ghcWrapper = assert uulib.ghc == ghc;
import ../development/compilers/ghc-wrapper {
inherit stdenv ghc;
libraries = [];
};
*/
helium = import ../development/compilers/helium {
inherit fetchurl stdenv ghc;
};
#TODO add packages http://cvs.haskell.org/Hugs/downloads/2006-09/packages/ and test
# commented out because it's using the new configuration style proposal which is unstable
#hugs = import ../development/compilers/hugs {
#inherit lib fetchurl stdenv;
#};
j2sdk14x =
assert system == "i686-linux";
import ../development/compilers/jdk/default-1.4.nix {
inherit fetchurl stdenv;
};
jdk = jdkdistro true false;
jre = jdkdistro false false;
jdkPlugin = jdkdistro true true;
jrePlugin = jdkdistro false true;
supportsJDK =
system == "i686-linux" ||
system == "x86_64-linux" ||
system == "powerpc-linux";
jdkdistro = installjdk: pluginSupport:
assert supportsJDK;
(if pluginSupport then appendToName "plugin" else x: x) (import ../development/compilers/jdk {
inherit fetchurl stdenv unzip installjdk xlibs pluginSupport;
libstdcpp5 = gcc33.gcc;
});
jikes = import ../development/compilers/jikes {
inherit fetchurl stdenv;
};
mono = import ../development/compilers/mono {
inherit fetchurl stdenv bison pkgconfig;
inherit (gtkLibs) glib;
};
monoDLLFixer = import ../build-support/mono-dll-fixer {
inherit stdenv perl;
};
nasm = import ../development/compilers/nasm {
inherit fetchurl stdenv;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
ocaml = getVersion "ocaml" ocaml_alts;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
ocaml_alts = import ../development/compilers/ocaml {
inherit fetchurl stdenv x11 ncurses;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
stdenv34 = overrideGCC stdenv gcc34;
};
/*
gcj = import ../build-support/gcc-wrapper/default2.nix {
name = "gcj";
nativeTools = false;
nativeLibc = false;
gcc = import ../development/compilers/gcc-4.0 {
inherit fetchurl stdenv noSysDirs;
langJava = true;
langCC = false;
langC = false;
langF77 = false;
};
inherit (stdenv.gcc) binutils libc;
inherit stdenv;
};
*/
opencxx = import ../development/compilers/opencxx {
inherit fetchurl stdenv libtool;
gcc = gcc33;
};
qcmm = import ../development/compilers/qcmm {
lua = lua4;
ocaml = builtins.getAttr "3.08.0" ocaml_alts;
inherit fetchurl stdenv mk noweb groff;
};
strategoLibraries = import ../development/compilers/strategoxt/libraries/stratego-libraries-0.17pre.nix {
inherit stdenv fetchurl pkgconfig aterm;
};
strategoxt = import ../development/compilers/strategoxt {
inherit fetchurl pkgconfig sdf aterm;
stdenv = overrideInStdenv stdenv [gnumake380];
};
strategoxtUtils = import ../development/compilers/strategoxt/utils {
inherit fetchurl pkgconfig stdenv aterm sdf strategoxt;
};
transformers = import ../development/compilers/transformers {
inherit fetchurl pkgconfig sdf;
aterm = aterm23x;
stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;
strategoxt = import ../development/compilers/strategoxt/strategoxt-0.14.nix {
inherit fetchurl pkgconfig sdf;
aterm = aterm23x;
stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;
};
stlport = import ../development/libraries/stlport {
inherit fetchurl stdenv;
};
};
visualcpp = import ../development/compilers/visual-c++ {
inherit fetchurl stdenv cabextract;
};
win32hello = import ../development/compilers/visual-c++/test {
inherit fetchurl stdenv visualcpp windowssdk;
};
wrapGCC = baseGCC: wrapGCCWithGlibc baseGCC glibc;
wrapGCCWithGlibc = baseGCC: glibc: import ../build-support/gcc-wrapper {
nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
gcc = baseGCC;
libc = glibc;
inherit stdenv binutils;
};
### DEVELOPMENT / INTERPRETERS
clisp = import ../development/interpreters/clisp {
inherit fetchurl stdenv libsigsegv gettext
readline ncurses coreutils pcre zlib;
inherit (xlibs) libX11 libXau libXt;
};
guile = import ../development/interpreters/guile {
inherit fetchurl stdenv ncurses readline libtool gmp;
};
kaffe = import ../development/interpreters/kaffe {
inherit fetchurl stdenv jikes alsaLib xlibs;
};
lua4 = import ../development/interpreters/lua-4 {
inherit fetchurl stdenv;
};
lua5 = import ../development/interpreters/lua-5 {
inherit fetchurl stdenv ncurses readline;
};
octave = import ../development/interpreters/octave {
inherit stdenv fetchurl readline ncurses perl flex;
g77 = g77_41;
};
perl = if !stdenv.isLinux then sysPerl else realPerl;
# FIXME: unixODBC needs patching on Darwin (see darwinports)
phpOld = import ../development/interpreters/php {
inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
unixODBC =
if stdenv.isDarwin then null else unixODBC;
};
# FIXME somehow somewhen: We need to recompile php if the ini file changes because the only way to
# tell the apache module where to look for this file is using a compile time flag ;-(
# perhaps this can be done setting php_value in apache don't have time to investigate any further ?
# This expression is a quick hack now. But perhaps it helps you adding the configuration flags you need?
php = (import ../development/interpreters/php_configurable) {
inherit mkDerivationByConfiguration stdenv mysql;
lib = lib_unstable;
inherit fetchurl flex bison apacheHttpd; # gettext;
inherit libxml2;
flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
python = getVersion "python" python_alts;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
python_alts = import ../development/interpreters/python {
inherit fetchurl stdenv zlib bzip2;
};
pyrexFun = lib.sumArgs (selectVersion ../development/interpreters/pyrex) {
inherit fetchurl stdenv stringsWithDeps lib builderDefs;
python = builtins.getAttr "2.5" python_alts;
};
pyrex = pyrexFun {version = "0.9.6";} null;
QiFun = lib.sumArgs (selectVersion ../development/compilers/qi) {
inherit clisp stdenv fetchurl builderDefs unzip;
};
Qi = QiFun {
version = getConfig ["Qi" "version"] "9.1";
} null;
realPerl = import ../development/interpreters/perl {
inherit fetchurl stdenv;
};
ruby = import ../development/interpreters/ruby {
inherit fetchurl stdenv readline ncurses;
};
spidermonkey = import ../development/interpreters/spidermonkey {
inherit fetchurl stdenv readline;
};
sysPerl = import ../development/interpreters/sys-perl {
inherit stdenv;
};
tcl = import ../development/interpreters/tcl {
inherit fetchurl stdenv;
};
xulrunner = import ../development/interpreters/xulrunner {
inherit fetchurl stdenv pkgconfig perl zip;
inherit (gtkLibs) gtk;
inherit (gnome) libIDL;
inherit (xlibs) libXi;
};
xulrunnerWrapper = {application, launcher}:
import ../development/interpreters/xulrunner/wrapper {
inherit stdenv xulrunner application launcher;
};
### DEVELOPMENT / MISC
/*
toolbus = import ../development/interpreters/toolbus {
inherit stdenv fetchurl atermjava toolbuslib aterm yacc flex;
};
*/
ecj = import ../development/eclipse/ecj {
inherit fetchurl stdenv unzip jre ant;
};
jdtsdk = import ../development/eclipse/jdt-sdk {
inherit fetchurl stdenv unzip;
};
windowssdk = import ../development/misc/windows-sdk {
inherit fetchurl stdenv cabextract;
};
### DEVELOPMENT / TOOLS
antlr = import ../development/tools/parsing/antlr/antlr-2.7.6.nix {
inherit fetchurl stdenv jre;
};
antlr3 = import ../development/tools/parsing/antlr {
inherit fetchurl stdenv jre;
};
ant = apacheAnt;
apacheAnt = import ../development/tools/build-managers/apache-ant {
inherit fetchurl stdenv jdk;
name = "ant-" + jdk.name;
};
apacheAnt14 = import ../development/tools/build-managers/apache-ant {
inherit fetchurl stdenv;
jdk = j2sdk14x;
name = "ant-" + j2sdk14x.name;
};
autoconf = autoconf261;
autoconf261 = import ../development/tools/misc/autoconf {
inherit fetchurl stdenv perl m4;
};
automake = automake19x;
automake17x = import ../development/tools/misc/automake/automake-1.7.x.nix {
inherit fetchurl stdenv perl autoconf;
};
automake19x = import ../development/tools/misc/automake/automake-1.9.x.nix {
inherit fetchurl stdenv perl autoconf;
};
# commented out because it's using the new configuration style proposal which is unstable
#avrdude = import ../development/tools/misc/avrdude {
# inherit lib fetchurl stdenv flex yacc;
#};
binutils = useFromStdenv (stdenv ? binutils) stdenv.binutils
(import ../development/tools/misc/binutils {
inherit fetchurl stdenv noSysDirs;
});
bison = bison1875;
bison1875 = import ../development/tools/parsing/bison/bison-1.875.nix {
inherit fetchurl stdenv m4;
};
bison23 = import ../development/tools/parsing/bison/bison-2.3.nix {
inherit fetchurl stdenv m4;
};
ctags = import ../development/tools/misc/ctags {
inherit fetchurl stdenv;
};
cmake = import ../development/tools/build-managers/cmake {
inherit fetchurl stdenv replace;
};
elfutilsFun = lib.sumArgs
(selectVersion ../development/tools/misc/elfutils) {
inherit fetchurl stdenv;
};
elfutils = elfutilsFun {
version = "0.131";
} null;
epm = import ../development/tools/misc/epm {
inherit fetchurl stdenv rpm;
};
flex = flex254a;
flex2533 = import ../development/tools/parsing/flex/flex-2.5.33.nix {
inherit fetchurl stdenv yacc m4;
};
flex254a = import ../development/tools/parsing/flex/flex-2.5.4a.nix {
inherit fetchurl stdenv yacc;
};
frown = import ../development/tools/parsing/frown {
inherit fetchurl stdenv ghc;
};
m4 = gnum4;
gnum4 = import ../development/tools/misc/gnum4 {
inherit fetchurl stdenv;
};
gnumake = useFromStdenv (stdenv ? gnumake) stdenv.gnumake
(import ../development/tools/build-managers/gnumake {
inherit fetchurl stdenv;
});
gnumake380 = import ../development/tools/build-managers/gnumake-3.80 {
inherit fetchurl stdenv;
};
gperf = import ../development/tools/misc/gperf {
inherit fetchurl stdenv;
};
happy = import ../development/tools/parsing/happy {
inherit fetchurl stdenv perl ghc;
};
help2man = import ../development/tools/misc/help2man {
inherit fetchurl stdenv perl gettext perlLocaleGettext;
};
iconnamingutils = import ../development/tools/misc/icon-naming-utils {
inherit fetchurl stdenv perl perlXMLSimple;
};
indentFun = lib.sumArgs (selectVersion ../development/tools/misc/indent) {
inherit fetchurl stdenv builderDefs;
};
indent = indentFun {
version = "2.2.9";
} null;
jikespg = import ../development/tools/parsing/jikespg {
inherit fetchurl stdenv;
};
kcachegrind = import ../development/tools/misc/kcachegrind {
inherit fetchurl stdenv kdelibs zlib perl expat libpng libjpeg;
inherit (xlibs) libX11 libXext libSM;
qt = qt3;
};
lcov = import ../development/tools/misc/lcov {
inherit fetchurl stdenv perl;
};
libtool = import ../development/tools/misc/libtool {
inherit fetchurl stdenv perl m4;
};
lsof = import ../development/tools/misc/lsof {
inherit fetchurl stdenv;
};
ltrace = import ../development/tools/misc/ltrace {
inherit fetchurl stdenv builderDefs stringsWithDeps lib;
elfutils = elfutilsFun {version = "0.127";} null;
};
mk = import ../development/tools/build-managers/mk {
inherit fetchurl stdenv;
};
noweb = import ../development/tools/literate-programming/noweb {
inherit fetchurl stdenv;
};
patchelf = useFromStdenv (stdenv ? patchelf) stdenv.patchelf
(import ../development/tools/misc/patchelf {
inherit fetchurl stdenv;
});
/**
* pkgconfig is optionally taken from the stdenv to allow bootstrapping
* of glib and pkgconfig itself on MinGW.
*/
pkgconfig = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig
(import ../development/tools/misc/pkgconfig {
inherit fetchurl stdenv;
});
# couldn't find the source yet
selenium_rc_binary = import ../development/tools/selenium/remote-control {
inherit fetchurl stdenv unzip;
};
scons = import ../development/tools/build-managers/scons {
inherit fetchurl stdenv python;
};
sdf = import ../development/tools/parsing/sdf {
inherit fetchurl aterm getopt pkgconfig;
# Note: sdf2-bundle currently requires GNU make 3.80; remove
# explicit dependency when this is fixed.
stdenv = overrideInStdenv stdenv [gnumake380];
};
strace = import ../development/tools/misc/strace {
inherit fetchurl stdenv;
};
swig = import ../development/tools/misc/swig {
inherit fetchurl stdenv perl python;
perlSupport = true;
pythonSupport = true;
javaSupport = false;
};
swigWithJava = lowPrio (appendToName "with-java" (import ../development/tools/misc/swig {
inherit fetchurl stdenv jdk;
perlSupport = false;
pythonSupport = false;
javaSupport = true;
}));
texinfo = import ../development/tools/misc/texinfo {
inherit fetchurl stdenv ncurses;
};
uisp = import ../development/tools/misc/uisp {
inherit fetchurl stdenv;
};
uuagc = import ../development/tools/haskell/uuagc {
inherit fetchurl stdenv;
ghc = ghc66;
uulib = uulib66;
};
gdb = import ../development/tools/misc/gdb {
inherit fetchurl stdenv ncurses;
};
valgrind = import ../development/tools/misc/valgrind {
inherit fetchurl stdenv;
};
yacc = bison;
### DEVELOPMENT / LIBRARIES
a52dec = import ../development/libraries/a52dec {
inherit fetchurl stdenv;
};
aalib = import ../development/libraries/aalib {
inherit fetchurl stdenv ncurses;
};
acl = import ../development/libraries/acl {
inherit stdenv fetchurl autoconf libtool gettext attr;
};
/*
agg = import ../development/libraries/agg {
inherit fetchurl stdenv autoconf automake libtool pkgconfig;
};
*/
apr = import ../development/libraries/apr {
inherit fetchurl stdenv;
};
aprutil = import ../development/libraries/apr-util {
inherit fetchurl stdenv apr expat db4;
bdbSupport = true;
};
arts = import ../development/libraries/arts {
inherit fetchurl stdenv pkgconfig;
inherit (xlibs) libX11 libXext;
inherit kdelibs zlib libjpeg libpng perl;
qt = qt3;
inherit (gnome) glib;
};
aspell = import ../development/libraries/aspell {
inherit fetchurl stdenv perl;
};
aspellDicts = recurseIntoAttrs (import ../development/libraries/aspell/dictionaries.nix {
inherit fetchurl stdenv aspell which;
});
aterm = lowPrio (import ../development/libraries/aterm {
inherit fetchurl stdenv;
});
aterm242fixes = import ../development/libraries/aterm/2.4.2-fixes.nix {
inherit fetchurl stdenv;
};
aterm23x = import ../development/libraries/aterm/2.3.nix {
inherit fetchurl stdenv;
};
attr = import ../development/libraries/attr {
inherit stdenv fetchurl autoconf libtool gettext;
};
audiofile = import ../development/libraries/audiofile {
inherit fetchurl stdenv;
};
axis = import ../development/libraries/axis {
inherit fetchurl stdenv;
};
beecrypt = import ../development/libraries/beecrypt {
inherit fetchurl stdenv m4;
};
boehmgc = import ../development/libraries/boehm-gc {
inherit fetchurl stdenv;
};
boost = import ../development/libraries/boost {
inherit fetchurl stdenv icu zlib bzip2 python;
};
cairo = import ../development/libraries/cairo {
inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
};
chmlib = import ../development/libraries/chmlib {
inherit fetchurl stdenv;
};
cil = import ../development/libraries/cil {
inherit stdenv fetchurl ocaml perl;
};
cilaterm = import ../development/libraries/cil-aterm {
stdenv = overrideInStdenv stdenv [gnumake380];
inherit fetchurl perl ocaml;
};
clanlib = import ../development/libraries/clanlib {
inherit fetchurl stdenv zlib libpng libjpeg libvorbis libogg mesa;
inherit (xlibs) libX11 xf86vidmodeproto libXmu libXxf86vm;
};
clearsilver = import ../development/libraries/clearsilver {
inherit fetchurl stdenv python;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
cluceneCore = (import ../development/libraries/clucene-core) {
inherit fetchurl stdenv;
};
coredumper = import ../development/libraries/coredumper {
inherit fetchurl stdenv;
};
ctl = import ../development/libraries/ctl {
inherit fetchurl stdenv ilmbase;
};
cppunit = import ../development/libraries/cppunit {
inherit fetchurl stdenv;
};
cracklib = import ../development/libraries/cracklib {
inherit fetchurl stdenv;
};
cyrus_sasl = import ../development/libraries/cyrus-sasl {
inherit fetchurl stdenv openssl db4 gettext;
};
db4 = db45;
db44 = import ../development/libraries/db4/db4-4.4.nix {
inherit fetchurl stdenv;
};
db45 = import ../development/libraries/db4/db4-4.5.nix {
inherit fetchurl stdenv;
};
# I think, this is a bad practice to use getVersion for various build
# variants, but it's 5 o'clock now...
dbus = getVersion "dbus" dbus_alts;
dbus_alts = rec
{
noX11 = import ../development/libraries/dbus {
inherit fetchurl stdenv pkgconfig expat;
};
withX11 = import ../development/libraries/dbus_x {
inherit fetchurl stdenv pkgconfig expat;
inherit (xlibs) libX11 libICE libSM;
};
default = noX11;
};
dbus_glib = import ../development/libraries/dbus-glib {
inherit fetchurl stdenv pkgconfig gettext dbus expat;
inherit (gtkLibs) glib;
};
dclib = import ../development/libraries/dclib {
inherit fetchurl stdenv libxml2 openssl bzip2;
};
directfb = import ../development/libraries/directfb {
inherit fetchurl stdenv perl;
};
enchant = import ../development/libraries/enchant {
inherit fetchurl stdenv aspell pkgconfig;
inherit (gnome) glib;
};
exiv2 = import ../development/libraries/exiv2 {
inherit fetchurl stdenv zlib;
};
expat = import ../development/libraries/expat {
inherit fetchurl stdenv;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
facile = import ../development/libraries/facile {
inherit fetchurl stdenv;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
# Actually, we don't need this version but we need native-code compilation
ocaml = builtins.getAttr "3.10.0" ocaml_alts;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
};
ffmpeg = import ../development/libraries/ffmpeg {
inherit fetchurl stdenv;
};
ffmpeg_svn = import ../development/libraries/ffmpeg_svn_snapshot {
inherit fetchsvn stdenv;
};
fftw = import ../development/libraries/fftw {
inherit fetchurl stdenv builderDefs stringsWithDeps;
};
fltk20 = (import ../development/libraries/fltk) {
inherit mkDerivationByConfiguration x11;
inherit fetchurl stdenv mesa mesaHeaders libpng libjpeg zlib ;
flags = [ "useNixLibs" "threads" "shared" "gl" ];
lib = lib_unstable;
};
cfitsio = import ../development/libraries/cfitsio {
inherit fetchurl stdenv;
};
fontconfig = import ../development/libraries/fontconfig {
inherit fetchurl stdenv freetype expat;
};
freealut = import ../development/libraries/freealut {
inherit fetchurl stdenv openal;
};
freeglut = assert mesaSupported; import ../development/libraries/freeglut {
inherit fetchurl stdenv x11 mesa;
};
freetype = import ../development/libraries/freetype {
inherit fetchurl stdenv;
};
fribidi = import ../development/libraries/fribidi {
inherit fetchurl stdenv;
};
fam = gamin;
gamin = import ../development/libraries/gamin {
inherit fetchurl stdenv python pkgconfig;
inherit (gtkLibs) glib;
};
geos = import ../development/libraries/geos {
lib = lib_unstable;
inherit fetchurl fetchsvn stdenv mkDerivationByConfiguration autoconf automake libtool swig which;
use_svn = stdenv.system == "x86_64-linux";
python = python;
# optional features:
# python / ruby support
};
gettext = getVersion "gettext" gettext_alts;
gettext_alts = import ../development/libraries/gettext {
inherit fetchurl stdenv;
};
gd = import ../development/libraries/gd {
inherit fetchurl stdenv zlib libpng freetype libjpeg fontconfig;
};
gdal = stdenv.mkDerivation {
name = "gdal-1.4.2";
src = fetchurl {
url = http://download.osgeo.org/gdal/gdal-1.4.2.tar.gz;
sha256 = "1vl8ym9y7scm0yd4vghjfqims69b9h1gn9l4zvy2jyglh35p8vpf";
};
};
glibc = useFromStdenv (stdenv ? glibc) stdenv.glibc
(import ../development/libraries/glibc-2.7 {
inherit fetchurl stdenv kernelHeaders;
#installLocales = false;
});
glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {
inherit fetchurl stdenv pkgconfig libsigcxx;
inherit (gtkLibs26) glib;
};
gmime = import ../development/libraries/gmime {
inherit fetchurl stdenv pkgconfig zlib;
inherit (gtkLibs) glib;
};
gmp = import ../development/libraries/gmp {
inherit fetchurl stdenv m4;
};
#GMP ex-satellite, so better keep it near gmp
mpfr = import ../development/libraries/mpfr {
inherit fetchurl stdenv gmp;
};
gnet = import ../development/libraries/gnet {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) glib;
};
gnutls = import ../development/libraries/gnutls {
inherit fetchurl stdenv libgcrypt zlib lzo;
};
gpgme = import ../development/libraries/gpgme {
inherit fetchurl stdenv libgpgerror pkgconfig pth gnupg gnupg2;
inherit (gtkLibs) glib;
};
# gnu scientific library
gsl = import ../development/libraries/gsl {
inherit fetchurl stdenv;
};
gtkLibs = recurseIntoAttrs gtkLibs210;
gtkLibs1x = import ../development/libraries/gtk-libs-1.x {
inherit fetchurl stdenv x11 libtiff libjpeg libpng;
};
gtkLibs210 = import ../development/libraries/gtk-libs-2.10 {
inherit fetchurl stdenv pkgconfig gettext perl x11
libtiff libjpeg libpng cairo;
inherit (xlibs) libXinerama libXrandr;
xineramaSupport = true;
};
gtkLibs22 = import ../development/libraries/gtk-libs-2.2 {
inherit fetchurl stdenv pkgconfig gettext perl x11
libtiff libjpeg libpng;
};
gtkLibs24 = import ../development/libraries/gtk-libs-2.4 {
inherit fetchurl stdenv pkgconfig gettext perl x11
libtiff libjpeg libpng;
};
gtkLibs26 = import ../development/libraries/gtk-libs-2.6 {
inherit fetchurl stdenv pkgconfig gettext perl x11
libtiff libjpeg libpng;
};
gtkLibs28 = import ../development/libraries/gtk-libs-2.8 {
inherit fetchurl stdenv pkgconfig gettext perl x11
libtiff libjpeg libpng cairo;
inherit (xlibs) libXinerama;
xineramaSupport = true;
};
gtkmm = import ../development/libraries/gtk-libs-2.6/gtkmm {
inherit fetchurl stdenv pkgconfig libsigcxx;
inherit (gtkLibs26) gtk atk;
inherit glibmm;
};
gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp {
inherit fetchurl stdenv mono pkgconfig monoDLLFixer;
inherit (gnome) gtk;
gtksharp = gtksharp2;
};
gtksharp1 = import ../development/libraries/gtk-sharp-1 {
inherit fetchurl stdenv mono pkgconfig libxml2 monoDLLFixer;
inherit (gnome) gtk glib pango libglade libgtkhtml gtkhtml
libgnomecanvas libgnomeui libgnomeprint
libgnomeprintui GConf;
};
gtksharp2 = import ../development/libraries/gtk-sharp-2 {
inherit fetchurl stdenv mono pkgconfig libxml2 monoDLLFixer;
inherit (gnome) gtk glib pango libglade libgtkhtml gtkhtml
libgnomecanvas libgnomeui libgnomeprint
libgnomeprintui GConf gnomepanel;
};
gtksourceviewsharp = import ../development/libraries/gtksourceview-sharp {
inherit fetchurl stdenv mono pkgconfig monoDLLFixer;
inherit (gnome) gtksourceview;
gtksharp = gtksharp2;
};
gtkspell = import ../development/libraries/gtkspell {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) gtk;
inherit aspell;
};
# TODO : Add MIT Kerberos and let admin choose.
kerberos = heimdal;
heimdal = import ../development/libraries/kerberos/heimdal.nix {
inherit fetchurl stdenv readline db4 openssl openldap cyrus_sasl;
};
hsqldb = import ../development/libraries/java/hsqldb {
inherit stdenv fetchurl unzip;
};
icu = import ../development/libraries/icu {
inherit fetchurl stdenv;
};
id3lib = import ../development/libraries/id3lib {
inherit fetchurl stdenv;
};
ilmbase = import ../development/libraries/ilmbase {
inherit fetchurl stdenv;
};
imlib = import ../development/libraries/imlib {
inherit fetchurl stdenv libjpeg libtiff libungif libpng;
inherit (xlibs) libX11 libXext xextproto;
};
imlib2 = import ../development/libraries/imlib2 {
inherit fetchurl stdenv x11 libjpeg libtiff libungif libpng bzip2;
};
indilib = import ../development/libraries/indilib {
inherit fetchurl stdenv cfitsio libusb zlib;
};
iniparser = import ../development/libraries/iniparser {
inherit fetchurl stdenv;
};
intltoolFun = lib.sumArgs (selectVersion ../development/tools/misc/intltool) {
inherit fetchurl stdenv lib builderDefs stringsWithDeps
perl perlXMLParser;
};
intltool = intltoolFun {version = "0.36.2";} null;
jasper = import ../development/libraries/jasper {
inherit fetchurl stdenv unzip libjpeg freeglut mesa;
inherit (xlibs) xproto libX11 libICE libXmu libXi libXext libXt;
};
lablgtk = import ../development/libraries/lablgtk {
inherit fetchurl stdenv ocaml pkgconfig;
inherit (gtkLibs) gtk;
};
lcms = import ../development/libraries/lcms {
inherit fetchurl stdenv;
};
lesstif = import ../development/libraries/lesstif {
inherit fetchurl stdenv x11;
inherit (xlibs) libXp libXau;
};
libarchive = import ../development/libraries/libarchive {
inherit fetchurl stdenv zlib;
};
libassuan = import ../development/libraries/libassuan {
inherit fetchurl stdenv pth;
};
libavc1394 = import ../development/libraries/libavc1394 {
inherit fetchurl stdenv pkgconfig libraw1394;
};
libcaca = import ../development/libraries/libcaca {
inherit fetchurl stdenv ncurses;
};
libcdaudio = import ../development/libraries/libcdaudio {
inherit fetchurl stdenv;
};
libcm = assert mesaSupported; import ../development/libraries/libcm {
inherit fetchurl stdenv pkgconfig xlibs mesa;
inherit (gtkLibs) glib;
};
libdaemon = import ../development/libraries/libdaemon {
inherit fetchurl stdenv;
};
libdbiFun = lib.sumArgs (selectVersion ../development/libraries/libdbi) {
inherit stdenv fetchurl builderDefs;
};
libdbi = libdbiFun {
version = "0.8.2";
} null;
libdbiDriversFun = lib.sumArgs (selectVersion ../development/libraries/libdbi-drivers) {
inherit stdenv fetchurl builderDefs libdbi;
};
libdbiDrivers = libdbiDriversFun {
version = "0.8.2-1";
inherit sqlite mysql;
} null;
libdv = import ../development/libraries/libdv {
lib = lib_unstable;
inherit fetchurl stdenv mkDerivationByConfiguration;
};
libdrm = import ../development/libraries/libdrm {
inherit fetchurl stdenv;
};
libdvdcss = import ../development/libraries/libdvdcss {
inherit fetchurl stdenv;
};
libdvdnav = import ../development/libraries/libdvdnav {
inherit fetchurl stdenv;
};
libdvdread = import ../development/libraries/libdvdread {
inherit fetchurl stdenv libdvdcss;
};
libevent = import ../development/libraries/libevent {
inherit fetchurl stdenv;
};
libexif = import ../development/libraries/libexif {
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
inherit fetchurl stdenv gettext;
};
libextractorFun = lib.sumArgs (selectVersion ../development/libraries/libextractor)
{
inherit fetchurl stdenv builderDefs zlib;
};
libextractor = libextractorFun {
version = "0.5.18";
} null;
libgcrypt = import ../development/libraries/libgcrypt {
inherit fetchurl stdenv libgpgerror;
};
libgpgerror = import ../development/libraries/libgpg-error {
inherit fetchurl stdenv;
};
libgphoto2 = import ../development/libraries/libgphoto2 {
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
inherit fetchurl stdenv pkgconfig libusb libtool libexif libjpeg gettext;
};
# commented out because it's using the new configuration style proposal which is unstable
libsamplerate = if builtins ? listToAttrs then (import ../development/libraries/libsamplerate) {
inherit fetchurl stdenv mkDerivationByConfiguration pkgconfig lib;
} else null;
libgsf = import ../development/libraries/libgsf {
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
inherit fetchurl stdenv perl perlXMLParser pkgconfig libxml2 gettext bzip2
python;
inherit (gnome) glib gnomevfs libbonobo;
};
libidn = import ../development/libraries/libidn {
inherit fetchurl stdenv;
};
libiec61883 = import ../development/libraries/libiec61883 {
inherit fetchurl stdenv pkgconfig libraw1394;
};
libjpeg = import ../development/libraries/libjpeg {
inherit fetchurl stdenv libtool;
};
libjpegStatic = lowPrio (appendToName "static" (import ../development/libraries/libjpeg-static {
inherit fetchurl stdenv libtool;
static = true;
}));
libksba = import ../development/libraries/libksba {
inherit fetchurl stdenv libgpgerror;
};
libmad = import ../development/libraries/libmad {
inherit fetchurl stdenv;
};
libmpcdec = import ../development/libraries/libmpcdec {
inherit fetchurl stdenv;
};
libmspack = import ../development/libraries/libmspack {
inherit fetchurl stdenv;
};
libnova = import ../development/libraries/libnova {
inherit fetchurl stdenv;
};
libogg = import ../development/libraries/libogg {
inherit fetchurl stdenv;
};
libotr = import ../development/libraries/libotr {
inherit fetchurl stdenv libgcrypt;
};
libpcap = import ../development/libraries/libpcap {
inherit fetchurl stdenv flex bison;
};
libpng = import ../development/libraries/libpng {
inherit fetchurl stdenv zlib;
};
/*libscdFun = lib.sumArgs (selectVersion ../development/libraries/libscd) {
inherit stdenv fetchurl builderDefs libextractor perl pkgconfig;
};
libscd = libscdFun {
version = "0.4.2";
} null;*/
libsigcxx = import ../development/libraries/libsigcxx {
inherit fetchurl stdenv pkgconfig;
};
libsigsegv = import ../development/libraries/libsigsegv {
inherit fetchurl stdenv;
};
libsndfile = import ../development/libraries/libsndfile {
inherit fetchurl stdenv;
};
libtheora = import ../development/libraries/libtheora {
inherit fetchurl stdenv libogg libvorbis;
};
libtiff = import ../development/libraries/libtiff {
inherit fetchurl stdenv zlib libjpeg;
};
giflib = import ../development/libraries/giflib {
inherit fetchurl stdenv;
};
libungif = import ../development/libraries/giflib/libungif.nix {
inherit fetchurl stdenv;
};
libusb = import ../development/libraries/libusb {
inherit fetchurl stdenv;
};
libunwind = import ../development/libraries/libunwind {
inherit fetchurl stdenv;
};
libvorbis = import ../development/libraries/libvorbis {
inherit fetchurl stdenv libogg;
};
libwmf = import ../development/libraries/libwmf {
inherit fetchurl stdenv pkgconfig imagemagick
zlib libpng freetype libjpeg libxml2;
inherit (gtkLibs) glib;
};
libwpd = import ../development/libraries/libwpd {
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
inherit fetchurl stdenv pkgconfig libgsf libxml2 bzip2;
inherit (gnome) glib;
};
libxcrypt = import ../development/libraries/libxcrypt {
inherit fetchurl stdenv;
};
libxml2 = import ../development/libraries/libxml2 {
inherit fetchurl stdenv zlib python;
pythonSupport = false;
};
libxml2Python = lowPrio (appendToName "with-python" (import ../development/libraries/libxml2 {
inherit fetchurl stdenv zlib python;
pythonSupport = true;
}));
libxslt = import ../development/libraries/libxslt {
inherit fetchurl stdenv libxml2;
};
libixp03 = import ../development/libraries/libixp/libixp-0.3.nix {
inherit fetchurl stdenv;
};
libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
inherit fetchurl stdenv;
includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
});
libzip = import ../development/libraries/libzip {
inherit fetchurl stdenv zlib;
};
log4cxx = import ../development/libraries/log4cxx {
inherit fetchurl stdenv automake autoconf libtool cppunit libxml2;
};
loudmouth = import ../development/libraries/loudmouth {
inherit fetchurl stdenv libidn gnutls pkgconfig;
inherit (gtkLibs) glib;
};
lzo = import ../development/libraries/lzo {
inherit fetchurl stdenv;
};
mesaSupported =
system == "i686-linux" ||
system == "x86_64-linux";
mesa = assert mesaSupported; import ../development/libraries/mesa {
inherit fetchurl stdenv pkgconfig x11 xlibs libdrm;
};
mesaHeaders = import ../development/libraries/mesa/headers.nix {
inherit stdenv;
mesaSrc = mesa.src;
};
mpeg2dec = import ../development/libraries/mpeg2dec {
inherit fetchurl stdenv;
};
mysqlConnectorODBC = import ../development/libraries/mysql-connector-odbc {
inherit fetchurl stdenv mysql libtool zlib unixODBC;
};
ncurses = import ../development/libraries/ncurses {
inherit fetchurl stdenv;
unicode = (system != "i686-cygwin");
};
ncursesDiet = import ../development/libraries/ncurses-diet {
inherit fetchurl;
stdenv = useDietLibC stdenv;
};
neon = import ../development/libraries/neon {
inherit fetchurl stdenv libxml2 zlib openssl;
compressionSupport = true;
sslSupport = true;
};
nss = import ../development/libraries/nss {
inherit fetchurl stdenv perl zip;
};
openal = import ../development/libraries/openal {
inherit fetchurl stdenv alsaLib autoconf automake libtool;
};
# added because I hope that it has been easier to compile on x86 (for blender)
openalSoft = import ../development/libraries/openalSoft {
inherit fetchurl stdenv alsaLib libtool cmake;
};
openbabel = import ../development/libraries/openbabel {
inherit fetchurl stdenv zlib libxml2;
};
# this ctl version is needed by openexr_viewers
openexr_ctl = import ../development/libraries/openexr_ctl {
inherit fetchurl stdenv ilmbase ctl;
openexr = openexr_1_6_1;
};
openexr_1_6_1 = import ../development/libraries/openexr {
inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
version = "1.6.1";
# optional features:
inherit ctl;
};
# This older version is needed by blender (it complains about missing half.h )
openexr_1_4_0 = import ../development/libraries/openexr {
inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
version = "1.4.0";
};
openldap = import ../development/libraries/openldap {
inherit fetchurl stdenv openssl cyrus_sasl db4;
};
openssl = import ../development/libraries/openssl {
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
inherit fetchurl stdenv perl;
};
ortp = import ../development/libraries/ortp {
inherit fetchurl stdenv;
};
pangoxsl = import ../development/libraries/pangoxsl {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) glib pango;
};
pcre = import ../development/libraries/pcre {
inherit fetchurl stdenv;
unicodeSupport = getConfig ["pcre" "unicode"] false;
};
poppler = import ../development/libraries/poppler {
inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg;
inherit (gtkLibs) glib gtk;
};
popt = import ../development/libraries/popt {
inherit fetchurl stdenv gettext;
};
popt110 = import ../development/libraries/popt/popt-1.10.6.nix {
inherit fetchurl stdenv gettext libtool autoconf automake;
};
proj = import ../development/libraries/proj.4 {
inherit fetchurl stdenv;
};
pth = import ../development/libraries/pth {
inherit fetchurl stdenv;
};
qt3 = import ../development/libraries/qt-3 {
inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor;
openglSupport = mesaSupported;
mysqlSupport = getConfig ["qt" "mysql"] false;
};
qt4 = getVersion "qt4" qt4_alts;
qt4_alts = import ../development/libraries/qt-4 {
inherit fetchurl fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
fontconfig freetype pkgconfig libtiff stdenv;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext
inputproto fixesproto libXfixes;
inherit (gnome) glib;
openglSupport = mesaSupported;
mysqlSupport = true;
};
readline = readline5;
readline4 = import ../development/libraries/readline/readline4.nix {
inherit fetchurl stdenv ncurses;
};
readline5 = import ../development/libraries/readline/readline5.nix {
inherit fetchurl stdenv ncurses;
};
# Also known as librdf, includes raptor and rasqal
redland = import ../development/libraries/redland {
inherit fetchurl stdenv openssl libxml2 pkgconfig perl;
bdb = db4;
};
rte = import ../development/libraries/rte {
inherit fetchurl stdenv;
};
SDL = import ../development/libraries/SDL {
inherit fetchurl stdenv x11 mesa alsaLib;
inherit (xlibs) libXrandr;
openglSupport = mesaSupported;
alsaSupport = true;
};
SDL_image = import ../development/libraries/SDL_image {
inherit fetchurl stdenv SDL libjpeg libungif libtiff libpng;
inherit (xlibs) libXpm;
};
SDL_mixer = import ../development/libraries/SDL_mixer {
inherit fetchurl stdenv SDL libogg libvorbis;
};
SDL_ttf = import ../development/libraries/SDL_ttf {
inherit fetchurl stdenv SDL freetype;
};
slang = import ../development/libraries/slang {
inherit fetchurl stdenv pcre libpng;
};
speex = import ../development/libraries/speex {
inherit fetchurl stdenv libogg;
};
sqlite = import ../development/libraries/sqlite {
inherit fetchurl stdenv;
};
t1lib = import ../development/libraries/t1lib {
inherit fetchurl stdenv x11;
inherit (xlibs) libXaw libXpm;
};
taglib = import ../development/libraries/taglib {
inherit fetchurl stdenv zlib;
};
tk = import ../development/libraries/tk {
inherit fetchurl stdenv tcl x11;
};
unixODBC = import ../development/libraries/unixODBC {
inherit fetchurl stdenv;
};
wxGTK = wxGTK26;
wxGTK26 = import ../development/libraries/wxGTK-2.6 {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) gtk;
inherit (xlibs) libXinerama libSM libXxf86vm xf86vidmodeproto;
};
wxGTK28fun = lib.sumArgs (import ../development/libraries/wxGTK-2.8);
wxGTK28deps = wxGTK28fun {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) gtk;
inherit (xlibs) libXinerama libSM libXxf86vm xf86vidmodeproto;
};
wxGTK28 = wxGTK28deps null;
Xaw3d = import ../development/libraries/Xaw3d {
inherit fetchurl stdenv x11 bison;
flex = flex2533;
inherit (xlibs) imake gccmakedep libXmu libXpm libXp;
};
xineLib = import ../development/libraries/xine-lib {
inherit fetchurl stdenv zlib x11 libdvdcss alsaLib pkgconfig mesa aalib SDL
libvorbis libtheora speex;
inherit (xlibs) libXv libXinerama;
};
xlibsWrapper = import ../development/libraries/xlibs-wrapper {
inherit stdenv;
packages = [
freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt
xlibs.libXft xlibs.libXext xlibs.libSM xlibs.libICE
xlibs.xextproto
];
};
zlib = import ../development/libraries/zlib {
inherit fetchurl stdenv;
};
zlibStatic = lowPrio (appendToName "static" (import ../development/libraries/zlib {
inherit fetchurl stdenv;
static = true;
}));
zvbi = import ../development/libraries/zvbi {
inherit fetchurl stdenv libpng x11;
pngSupport = true;
};
### DEVELOPMENT / LIBRARIES / JAVA
atermjava = import ../development/libraries/java/aterm {
inherit fetchurl sharedobjects jjtraveler jdk;
stdenv = overrideInStdenv stdenv [gnumake380];
};
commonsFileUpload = import ../development/libraries/java/jakarta-commons/file-upload {
inherit stdenv fetchurl;
};
httpunit = import ../development/libraries/java/httpunit {
inherit stdenv fetchurl unzip;
};
jakartabcel = import ../development/libraries/java/jakarta-bcel {
regexp = jakartaregexp;
inherit fetchurl stdenv;
};
jakartaregexp = import ../development/libraries/java/jakarta-regexp {
inherit fetchurl stdenv;
};
javaCup = import ../development/libraries/java/cup {
inherit stdenv fetchurl jdk;
};
javasvn = import ../development/libraries/java/javasvn {
inherit stdenv fetchurl unzip;
};
jclasslib = import ../development/tools/java/jclasslib {
inherit fetchurl stdenv xpf jre;
ant = apacheAnt14;
};
jdom = import ../development/libraries/java/jdom {
inherit stdenv fetchurl;
};
jflex = import ../development/libraries/java/jflex {
inherit stdenv fetchurl;
};
jjtraveler = import ../development/libraries/java/jjtraveler {
inherit fetchurl jdk;
stdenv = overrideInStdenv stdenv [gnumake380];
};
junit = import ../development/libraries/java/junit {
inherit stdenv fetchurl unzip;
};
lucene = import ../development/libraries/java/lucene {
inherit stdenv fetchurl;
};
mockobjects = import ../development/libraries/java/mockobjects {
inherit stdenv fetchurl;
};
saxon = import ../development/libraries/java/saxon {
inherit fetchurl stdenv unzip;
};
saxonb = import ../development/libraries/java/saxon/default8.nix {
inherit fetchurl stdenv unzip jre;
};
sharedobjects = import ../development/libraries/java/shared-objects {
inherit fetchurl jdk;
stdenv = overrideInStdenv stdenv [gnumake380];
};
swt = import ../development/libraries/java/swt {
inherit stdenv fetchurl unzip jdk pkgconfig;
inherit (gtkLibs) gtk;
inherit (xlibs) libXtst;
};
xalanj = import ../development/libraries/java/xalanj {
inherit stdenv fetchurl;
};
### DEVELOPMENT / LIBRARIES / HASKELL
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
gtk2hs = import ../development/libraries/haskell/gtk2hs {
inherit pkgconfig stdenv fetchurl cairo;
inherit (gnome) gtk glib GConf libglade libgtkhtml gtkhtml;
ghc = ghc661;
};
uulib64 = import ../development/libraries/haskell/uulib { # !!! remove?
inherit stdenv fetchurl ghc;
};
uulib66 = import ../development/libraries/haskell/uulib-ghc-6.6 { # !!! ugh
inherit stdenv fetchurl autoconf;
ghc = ghc66;
};
wxHaskell = import ../development/libraries/haskell/wxHaskell {
inherit stdenv fetchurl unzip ghc wxGTK;
};
### DEVELOPMENT / PERL MODULES
perlArchiveZip = import ../development/perl-modules/Archive-Zip {
inherit fetchurl perl;
};
perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB {
inherit fetchurl perl db4;
};
perlCGISession = import ../development/perl-modules/generic perl {
name = "CGI-Session-3.95";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz;
md5 = "fe9e46496c7c711c54ca13209ded500b";
};
};
perlCompressZlib = import ../development/perl-modules/Compress-Zlib {
inherit fetchurl perl;
};
perlDateManip = import ../development/perl-modules/generic perl {
name = "DateManip-5.42a";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/DateManip-5.42a.tar.gz;
md5 = "648386bbf46d021ae283811f75b07bdf";
};
};
perlDigestSHA1 = import ../development/perl-modules/generic perl {
name = "Digest-SHA1-2.11";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz;
md5 = "2449bfe21d6589c96eebf94dae24df6b";
};
};
perlEmailAddress = import ../development/perl-modules/generic perl {
name = "Email-Address-1.888";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Address-1.888.tar.gz;
sha256 = "0c6b8djnmiy0niskrvywd6867xd1qmn241ffdwj957dkqdakq9yx";
};
};
perlEmailSend = import ../development/perl-modules/generic perl {
name = "Email-Send-2.185";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Send-2.185.tar.gz;
sha256 = "0pbgnnbmv6z3zzqaiq1sdcv5d26ijhw4p8k8kp6ac7arvldblamz";
};
propagatedBuildInputs = [perlEmailSimple perlEmailAddress perlModulePluggable perlReturnValue];
};
perlEmailSimple = import ../development/perl-modules/generic perl {
name = "Email-Simple-2.003";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Simple-2.003.tar.gz;
sha256 = "0h8873pidhkqy7415s5sx8z614d0haxiknbjwrn65icrr2m0b8g6";
};
};
perlHTMLParser = import ../development/perl-modules/generic perl {
name = "HTML-Parser-3.56";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.56.tar.gz;
sha256 = "0x1h42r54aq4yqpwi7mla4jzia9c5ysyqh8ir2nav833f9jm6g2h";
};
propagatedBuildInputs = [perlHTMLTagset];
};
perlHTMLTagset = import ../development/perl-modules/generic perl {
name = "HTML-Tagset-3.10";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.10.tar.gz;
sha256 = "05k292qy7jzjlmmybis8nncpnwwa4jfkm7q3gq6866ydxrzds9xh";
};
};
perlHTMLTree = import ../development/perl-modules/generic perl {
name = "HTML-Tree-3.18";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/HTML-Tree-3.18.tar.gz;
md5 = "6a9e4e565648c9772e7d8ec6d4392497";
};
};
perlLocaleGettext = import ../development/perl-modules/generic perl {
name = "LocaleGettext-1.04";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/gettext-1.04.tar.gz;
md5 = "578dd0c76f8673943be043435b0fbde4";
};
};
perlLWP = import ../development/perl-modules/generic perl {
name = "libwww-perl-5.808";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.808.tar.gz;
sha256 = "1r5rslx68yplyd07bvjahjjrrqb56bhgg6gwdr9c16mv2s57gq12";
};
propagatedBuildInputs = [perlURI perlHTMLParser perlHTMLTagset];
};
perlModulePluggable = import ../development/perl-modules/generic perl {
name = "Module-Pluggable-3.5";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/S/SI/SIMONW/Module-Pluggable-3.5.tar.gz;
sha256 = "08rywi79pqn2c8zr17fmd18lpj5hm8lxd1j4v2k002ni8vhl43nv";
};
patches = [
../development/perl-modules/module-pluggable.patch
];
};
perlReturnValue = import ../development/perl-modules/generic perl {
name = "Return-Value-1.302";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Return-Value-1.302.tar.gz;
sha256 = "0hf5rmfap49jh8dnggdpvapy5r4awgx5hdc3acc9ff0vfqav8azm";
};
};
perlTermReadKey = import ../development/perl-modules/generic perl {
name = "TermReadKey-2.30";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/TermReadKey-2.30.tar.gz;
md5 = "f0ef2cea8acfbcc58d865c05b0c7e1ff";
};
};
perlURI = import ../development/perl-modules/generic perl {
name = "URI-1.35";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.35.tar.gz;
md5 = "1a933b1114c41a25587ee59ba8376f7c";
};
};
perlXMLDOM = import ../development/perl-modules/generic perl {
name = "XML-DOM-1.44";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/T/TJ/TJMATHER/XML-DOM-1.44.tar.gz;
sha256 = "1r0ampc88ni3sjpzr583k86076qg399arfm9xirv3cw49k3k5bzn";
};
# buildInputs = [libxml2];
propagatedBuildInputs = [perlXMLRegExp perlXMLParser perlLWP];
};
perlXMLLibXML = import ../development/perl-modules/generic perl {
name = "XML-LibXML-1.58";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/XML-LibXML-1.58.tar.gz;
md5 = "4691fc436e5c0f22787f5b4a54fc56b0";
};
buildInputs = [libxml2];
propagatedBuildInputs = [perlXMLLibXMLCommon perlXMLSAX];
};
perlXMLLibXMLCommon = import ../development/perl-modules/generic perl {
name = "XML-LibXML-Common-0.13";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/XML-LibXML-Common-0.13.tar.gz;
md5 = "13b6d93f53375d15fd11922216249659";
};
buildInputs = [libxml2];
};
perlXMLNamespaceSupport = import ../development/perl-modules/generic perl {
name = "XML-NamespaceSupport-1.08";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/XML-NamespaceSupport-1.08.tar.gz;
md5 = "81bd5ae772906d0579c10061ed735dc8";
};
buildInputs = [];
};
perlXMLParser = import ../development/perl-modules/XML-Parser {
inherit fetchurl perl expat;
};
perlXMLRegExp = import ../development/perl-modules/generic perl {
name = "XML-RegExp-0.03";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/T/TJ/TJMATHER/XML-RegExp-0.03.tar.gz;
sha256 = "1gkarylvdk3mddmchcwvzq09gpvx5z26nybp38dg7mjixm5bs226";
};
};
perlXMLSAX = import ../development/perl-modules/generic perl {
name = "XML-SAX-0.12";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/XML-SAX-0.12.tar.gz;
md5 = "bff58bd077a9693fc8cf32e2b95f571f";
};
propagatedBuildInputs = [perlXMLNamespaceSupport];
};
perlXMLSimple = import ../development/perl-modules/generic perl {
name = "XML-Simple-2.14";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/XML-Simple-2.14.tar.gz;
md5 = "f321058271815de28d214c8efb9091f9";
};
propagatedBuildInputs = [perlXMLParser];
};
perlXMLTwig = import ../development/perl-modules/generic perl {
name = "XML-Twig-3.15";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/XML-Twig-3.15.tar.gz;
md5 = "b26886b8bd19761fff37b23e4964b499";
};
propagatedBuildInputs = [perlXMLParser];
};
perlXMLWriter = import ../development/perl-modules/generic perl {
name = "XML-Writer-0.602";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/J/JO/JOSEPHW/XML-Writer-0.602.tar.gz;
sha256 = "0kdi022jcn9mwqsxy2fiwl2cjlid4x13r038jvi426fhjknl11nl";
};
};
### DEVELOPMENT / PYTHON MODULES
bsddb3 = import ../development/python-modules/bsddb3 {
inherit fetchurl stdenv python db4;
};
pil = import ../development/python-modules/pil {
inherit fetchurl stdenv python zlib libtiff libjpeg freetype;
};
psyco = import ../development/python-modules/psyco {
inherit fetchurl stdenv python;
};
pycairo = import ../development/python-modules/pycairo {
inherit fetchurl stdenv python pkgconfig cairo x11;
};
pycrypto = import ../development/python-modules/pycrypto {
inherit fetchurl stdenv python gmp;
};
pygame = import ../development/python-modules/pygame {
inherit fetchurl stdenv python pkgconfig SDL SDL_image
SDL_ttf;
};
pygobject = import ../development/python-modules/pygobject {
inherit fetchurl stdenv python pkgconfig;
inherit (gtkLibs) glib;
};
pygtk = import ../development/python-modules/pygtk {
inherit fetchurl stdenv python pkgconfig pygobject pycairo;
inherit (gtkLibs) glib gtk;
};
wxPython = wxPython26;
wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
inherit fetchurl stdenv pkgconfig python;
wxGTK = wxGTK26;
};
wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
inherit fetchurl stdenv pkgconfig python;
wxGTK = wxGTK28;
};
twisted = import ../development/python-modules/twisted {
inherit fetchurl stdenv python ZopeInterface;
};
ZopeInterface = import ../development/python-modules/ZopeInterface {
inherit fetchurl stdenv python;
};
### SERVERS
apacheHttpd = import ../servers/http/apache-httpd {
inherit fetchurl stdenv perl openssl db4 expat zlib;
sslSupport = true;
db4Support = true;
};
dovecot = import ../servers/mail/dovecot {
inherit fetchurl stdenv ;
};
ircdHybrid = import ../servers/irc/ircd-hybrid {
inherit fetchurl stdenv openssl zlib;
};
jetty = import ../servers/http/jetty {
inherit fetchurl stdenv unzip;
};
mod_python = import ../servers/http/apache-modules/mod_python {
inherit fetchurl stdenv apacheHttpd python;
};
mysql4 = import ../servers/sql/mysql {
inherit fetchurl stdenv ncurses zlib perl;
ps = procps; /* !!! Linux only */
};
mysql = import ../servers/sql/mysql5 {
inherit fetchurl stdenv ncurses zlib perl;
ps = procps; /* !!! Linux only */
};
mysql_jdbc = import ../servers/sql/mysql/jdbc {
inherit fetchurl stdenv ant;
};
nagios = import ../servers/monitoring/nagios {
inherit fetchurl stdenv perl gd libpng zlib;
gdSupport = true;
};
nagiosPluginsOfficial = import ../servers/monitoring/nagios/plugins/official {
inherit fetchurl stdenv openssh;
};
postgresql = import ../servers/sql/postgresql {
inherit fetchurl stdenv readline ncurses zlib;
};
postgresql_jdbc = import ../servers/sql/postgresql/jdbc {
inherit fetchurl stdenv ant;
};
samba = import ../servers/samba {
inherit stdenv fetchurl readline openldap pam kerberos popt iniparser
libunwind acl fam;
};
squid = import ../servers/squid {
inherit fetchurl stdenv mkDerivationByConfiguration perl;
lib = lib_unstable;
};
tomcat5 = import ../servers/http/tomcat {
inherit fetchurl stdenv jdk;
};
vsftpd = import ../servers/ftp/vsftpd {
inherit fetchurl openssl ;
stdenv = overrideGCC stdenv gcc295 ;
};
xorg = recurseIntoAttrs (import ../servers/x11/xorg {
inherit fetchurl stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa mesaHeaders
xkeyboard_config gettext;
});
### OS-SPECIFIC
# this creates a patch which can be applied to the kernel to integrate this module..
kernel_module_acerhk = import ../os-specific/linux/kernel/acerhk {
inherit fetchurl stdenv gnupatch;
kernel = builtins.getAttr "2.6.21" kernel_alts;
debug = true;
};
_915resolution = import ../os-specific/linux/915resolution {
inherit fetchurl stdenv;
};
/*
nfsUtils = import ../os-specific/linux/nfs-utils {
inherit fetchurl stdenv kernelHeaders tcp_wrapper;
};
*/
alsaLib = import ../os-specific/linux/alsa/library {
inherit fetchurl stdenv;
};
atherosFun = lib.sumArgs (selectVersion ../os-specific/linux/atheros) {
inherit fetchurl stdenv builderDefs;
};
atherosVersion = "r3122";
atherosFunCurrent = theKernel: (atherosFun {
version = atherosVersion;
kernel = theKernel;
} null);
bridge_utils = import ../os-specific/linux/bridge_utils {
inherit fetchurl stdenv autoconf automake;
};
alsaUtils = import ../os-specific/linux/alsa/utils {
inherit fetchurl stdenv alsaLib ncurses gettext;
};
cramfsswap = import ../os-specific/linux/cramfsswap {
inherit fetchurl stdenv zlib;
};
devicemapper = import ../os-specific/linux/device-mapper {
inherit fetchurl stdenv;
};
devicemapperStatic = lowPrio (appendToName "static" (import ../os-specific/linux/device-mapper {
inherit fetchurl stdenv;
static = true;
}));
dmidecodeFun = lib.sumArgs (selectVersion ../os-specific/linux/dmidecode) {
inherit fetchurl stdenv builderDefs;
};
dmidecode = dmidecodeFun {
version = "2.9";
} null;
dietlibc = import ../os-specific/linux/dietlibc {
inherit fetchurl glibc;
# Dietlibc 0.30 doesn't compile on PPC with GCC 4.1, bus GCC 3.4 works.
stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv;
};
e2fsprogs = import ../os-specific/linux/e2fsprogs {
inherit fetchurl stdenv gettext;
};
e2fsprogsDiet = lowPrio (appendToName "diet" (import ../os-specific/linux/e2fsprogs {
inherit fetchurl gettext;
stdenv = useDietLibC stdenv;
}));
e3cfsprogs = import ../os-specific/linux/e3cfsprogs {
inherit stdenv fetchurl gettext;
};
ext3cowtools = import ../os-specific/linux/ext3cow-tools {
inherit stdenv fetchurl;
kernel_ext3cowpatched = kernel;
};
eject = import ../os-specific/linux/eject {
inherit fetchurl stdenv gettext;
};
fuse = import ../os-specific/linux/fuse {
inherit fetchurl stdenv utillinux;
};
genext2fs = import ../os-specific/linux/genext2fs {
inherit fetchurl stdenv;
};
hal = import ../os-specific/linux/hal {
inherit fetchurl stdenv pkgconfig python pciutils usbutils expat
libusb dbus dbus_glib libvolume_id perl perlXMLParser
gettext zlib eject libsmbios udev;
inherit (gtkLibs) glib;
};
hdparm = import ../os-specific/linux/hdparm {
inherit fetchurl stdenv;
};
htop = import ../os-specific/linux/htop {
inherit fetchurl stdenv ncurses;
};
hwdata = import ../os-specific/linux/hwdata {
inherit fetchurl stdenv;
};
ifplugd = import ../os-specific/linux/ifplugd {
inherit fetchurl stdenv pkgconfig libdaemon;
};
initscripts = import ../os-specific/linux/initscripts {
inherit fetchurl stdenv popt pkgconfig;
inherit (gtkLibs) glib;
};
iproute = import ../os-specific/linux/iproute {
inherit fetchurl stdenv flex bison db4;
};
iputils = import ../os-specific/linux/iputils {
inherit fetchurl stdenv;
glibc = stdenv.gcc.libc;
kernelHeaders = stdenv.gcc.libc.kernelHeaders;
};
iptables = import ../os-specific/linux/iptables {
inherit fetchurl stdenv;
};
ipw2200fw = import ../os-specific/linux/firmware/ipw2200 {
inherit fetchurl stdenv;
};
iwlwifi = import ../os-specific/linux/iwlwifi {
inherit fetchurl stdenv kernel;
};
iwlwifi3945ucode = import ../os-specific/linux/firmware/iwlwifi-3945-ucode {
inherit fetchurl stdenv;
};
kbd = import ../os-specific/linux/kbd {
inherit fetchurl stdenv bison flex;
};
kernelHeaders = kernelHeaders_2_6_23;
kernelHeaders_2_6_21 = import ../os-specific/linux/kernel-headers/2.6.21.3.nix {
inherit fetchurl stdenv;
};
kernelHeaders_2_6_23 = import ../os-specific/linux/kernel-headers/2.6.23.8.nix {
inherit fetchurl stdenv;
};
kernelHeadersArm = import ../os-specific/linux/kernel-headers-cross {
inherit fetchurl stdenv;
cross = "arm-linux";
};
kernelHeadersMips = import ../os-specific/linux/kernel-headers-cross {
inherit fetchurl stdenv;
cross = "mips-linux";
};
kernelHeadersSparc = import ../os-specific/linux/kernel-headers-cross {
inherit fetchurl stdenv;
cross = "sparc-linux";
};
kernelscripts = import ../os-specific/linux/kernelscripts {
inherit stdenv module_init_tools kernel;
modules = [];
};
systemKernel = kernel;
kernel = getVersion "kernel" kernel_alts;
kernel_alts = import ../os-specific/linux/kernel {
inherit fetchurl stdenv perl mktemp module_init_tools;
extraPatches = getConfig ["kernel" "extraPatches"] [];
extraConfig =
lib.optional (getConfig ["kernel" "timer_stats"] false) "CONFIG_TIMER_STATS=y" ++
lib.optional (getConfig ["kernel" "no_irqbalance"] false) "# CONFIG_IRQBALANCE is not set" ++
[(getConfig ["kernel" "addConfig"] "")];
configFile = getConfig ["kernel" "configFile"] null;
};
kqemuFun = lib.sumArgs (selectVersion ../os-specific/linux/kqemu) {
inherit fetchurl stdenv builderDefs;
};
# No finished expression is provided - pick your own kernel
kqemuFunCurrent = theKernel: (kqemuFun {
version = "1.3.0pre11";
kernel = theKernel;
} null);
libselinux = import ../os-specific/linux/libselinux {
inherit fetchurl stdenv libsepol;
};
libraw1394 = import ../development/libraries/libraw1394 {
inherit fetchurl stdenv;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
libsexy = import ../development/libraries/libsexy {
inherit stdenv fetchurl pkgconfig libxml2;
inherit (gtkLibs) glib gtk pango;
};
librsvg = import ../development/libraries/librsvg {
inherit fetchurl stdenv;
inherit libxml2 pkgconfig cairo fontconfig freetype;
inherit (gtkLibs) glib pango gtk;
#gtkLibs = gtkLibs210; #need gtk+
libart = gnome.libart_lgpl;
};
libsepol = import ../os-specific/linux/libsepol {
inherit fetchurl stdenv;
};
libsmbios = import ../os-specific/linux/libsmbios {
inherit fetchurl stdenv libxml2;
};
klibc = import ../os-specific/linux/klibc {
inherit fetchurl stdenv perl bison mktemp kernel;
};
kvm = kvm49;
kvm12 = import ../os-specific/linux/kvm/12.nix {
inherit fetchurl zlib e2fsprogs SDL alsaLib;
stdenv = overrideGCC stdenv gcc34;
kernelHeaders = stdenv.gcc.libc.kernelHeaders;
};
kvm17 = import ../os-specific/linux/kvm/17.nix {
inherit fetchurl zlib e2fsprogs SDL alsaLib;
stdenv = overrideGCC stdenv gcc34;
kernelHeaders = kernelHeaders_2_6_21;
};
kvm49 = import ../os-specific/linux/kvm/49.nix {
inherit fetchurl zlib e2fsprogs SDL alsaLib;
stdenv = overrideGCC stdenv gcc34;
kernelHeaders = kernelHeaders_2_6_23;
};
libcap = import ../os-specific/linux/libcap {
inherit fetchurl stdenv;
};
libnscd = import ../os-specific/linux/libnscd {
inherit fetchurl stdenv;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
libnotify = import ../development/libraries/libnotify {
inherit stdenv fetchurl pkgconfig dbus dbus_glib;
inherit (gtkLibs) gtk glib;
};
libvolume_id = import ../os-specific/linux/libvolume_id {
inherit fetchurl stdenv;
};
lvm2 = import ../os-specific/linux/lvm2 {
inherit fetchurl stdenv devicemapper;
};
lvm2Static = lowPrio (appendToName "static" (import ../os-specific/linux/lvm2 {
inherit fetchurl stdenv;
static = true;
devicemapper = devicemapperStatic;
}));
mdadm = import ../os-specific/linux/mdadm {
inherit fetchurl stdenv groff;
};
mingetty = import ../os-specific/linux/mingetty {
inherit fetchurl stdenv;
};
mkinitrd = import ../os-specific/linux/mkinitrd {
inherit fetchurl stdenv;
popt = popt110;
};
module_init_tools = import ../os-specific/linux/module-init-tools {
inherit fetchurl stdenv;
};
module_aggregation = moduleSources:
import ../os-specific/linux/module-init-tools/aggregator.nix {
inherit fetchurl stdenv module_init_tools moduleSources builderDefs;
};
modutils = import ../os-specific/linux/modutils {
inherit fetchurl bison flex;
stdenv = overrideGCC stdenv gcc34;
};
/* compiles but has to be integrated into the kernel somehow
ndiswrapper = import ../os-specific/linux/ndiswrapper {
inherit fetchurl stdenv;
inherit kernel;
};
*/
nettools = import ../os-specific/linux/net-tools {
inherit fetchurl stdenv;
};
nvidiaDrivers = import ../os-specific/linux/nvidia {
inherit stdenv fetchurl kernel xlibs gtkLibs;
};
gw6c = import ../os-specific/linux/gw6c {
inherit fetchurl stdenv nettools openssl procps;
};
nss_ldap = import ../os-specific/linux/nss_ldap {
inherit fetchurl stdenv openldap;
};
ov511 = import ../os-specific/linux/ov511 {
inherit fetchurl kernel;
stdenv = overrideGCC stdenv gcc34;
};
pam = import ../os-specific/linux/pam {
inherit stdenv fetchurl cracklib flex;
};
pam_console = import ../os-specific/linux/pam_console {
inherit stdenv fetchurl pam autoconf automake libtool pkgconfig bison;
flex = if stdenv.system == "i686-linux" then flex else flex2533;
inherit (gtkLibs) glib;
};
pam_devperm = import ../os-specific/linux/pam_devperm {
inherit stdenv fetchurl pam;
};
pam_ldap = import ../os-specific/linux/pam_ldap {
inherit stdenv fetchurl pam openldap;
};
pam_login = import ../os-specific/linux/pam_login {
inherit stdenv fetchurl pam;
};
pam_unix2 = import ../os-specific/linux/pam_unix2 {
inherit stdenv fetchurl pam libxcrypt;
};
powertop = import ../os-specific/linux/powertop {
inherit fetchurl stdenv ncurses;
};
procps = import ../os-specific/linux/procps {
inherit fetchurl stdenv ncurses;
};
pwdutils = import ../os-specific/linux/pwdutils {
inherit fetchurl stdenv pam openssl libnscd;
};
reiserfsprogs = import ../os-specific/linux/reiserfsprogs {
inherit fetchurl stdenv;
};
radeontools = import ../os-specific/linux/radeontools {
inherit pciutils;
inherit fetchurl stdenv;
};
sdparmFun = lib.sumArgs (selectVersion ../os-specific/linux/sdparm) {
inherit fetchurl stdenv builderDefs;
};
sdparm = sdparmFun {
version = "1.02";
} null;
shadowutils = import ../os-specific/linux/shadow {
inherit fetchurl stdenv;
};
splashutils = import ../os-specific/linux/splashutils {
inherit fetchurl stdenv klibc;
zlib = zlibStatic;
libjpeg = libjpegStatic;
};
squashfsTools = import ../os-specific/linux/squashfs {
inherit fetchurl stdenv zlib;
};
sysklogd = import ../os-specific/linux/sysklogd {
inherit fetchurl stdenv;
};
syslinux = import ../os-specific/linux/syslinux {
inherit fetchurl stdenv nasm perl;
};
sysstat = import ../os-specific/linux/sysstat {
inherit fetchurl stdenv gettext;
};
sysvinit = import ../os-specific/linux/sysvinit {
inherit fetchurl stdenv;
};
sysvtools = import ../os-specific/linux/sysvinit {
inherit fetchurl stdenv;
withoutInitTools = true;
};
/*
# needed for nfs utils
tcp_wrapper = import ../os-specific/linux/tcp-wrapper {
inherit fetchurl stdenv kernelHeaders gnused;
};
*/
udev = import ../os-specific/linux/udev {
inherit fetchurl stdenv;
};
uml = (import ../os-specific/linux/kernel {
inherit fetchurl stdenv perl mktemp module_init_tools;
userModeLinux = true;
}).default;
umlutilities = import ../os-specific/linux/uml-utilities {
inherit fetchurl kernelHeaders stdenv;
tunctl = true;
};
upstart = import ../os-specific/linux/upstart {
inherit fetchurl stdenv;
};
upstartJobControl = import ../os-specific/linux/upstart/jobcontrol.nix {
inherit stdenv;
};
usbutils = import ../os-specific/linux/usbutils {
inherit fetchurl stdenv libusb;
};
utillinux = import ../os-specific/linux/util-linux {
inherit fetchurl stdenv;
};
utillinuxCurses = import ../os-specific/linux/util-linux {
inherit fetchurl stdenv ncurses;
};
utillinuxStatic = lowPrio (appendToName "static" (import ../os-specific/linux/util-linux {
inherit fetchurl;
stdenv = makeStaticBinaries stdenv;
}));
wirelesstools = import ../os-specific/linux/wireless-tools {
inherit fetchurl stdenv;
};
wpa_supplicant = import ../os-specific/linux/wpa_supplicant {
inherit fetchurl stdenv openssl;
};
xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys {
inherit stdenv xlibs expat libdrm;
};
### DATA
bakoma_ttf = import ../data/fonts/bakoma-ttf {
inherit fetchurl stdenv;
};
corefonts = import ../data/fonts/corefonts {
inherit fetchurl stdenv cabextract;
};
wrapFonts = paths : ((import ../data/fonts/fontWrap) {
inherit fetchurl stdenv builderDefs paths;
inherit (xorg) mkfontdir mkfontscale;
});
docbook5 = import ../data/sgml+xml/schemas/docbook-5.0 {
inherit fetchurl stdenv;
};
docbook_xml_dtd_412 = import ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix {
inherit fetchurl stdenv unzip;
};
docbook_xml_dtd_42 = import ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix {
inherit fetchurl stdenv unzip;
};
docbook_xml_dtd_43 = import ../data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix {
inherit fetchurl stdenv unzip;
};
docbook_xml_ebnf_dtd = import ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf {
inherit fetchurl stdenv unzip;
};
docbook_xml_xslt = docbook_xsl;
docbook_xsl = import ../data/sgml+xml/stylesheets/xslt/docbook {
inherit fetchurl stdenv;
};
docbook5_xsl = import ../data/sgml+xml/stylesheets/xslt/docbook5 {
inherit fetchurl stdenv;
};
freefont_ttf = import ../data/fonts/freefont-ttf {
inherit fetchurl stdenv;
};
manpages = import ../data/documentation/man-pages {
inherit fetchurl stdenv;
};
shared_mime_info = import ../data/misc/shared-mime-info {
inherit fetchurl stdenv perl perlXMLParser pkgconfig gettext libxml2;
inherit (gtkLibs) glib;
};
iana_etc = import ../data/misc/iana-etc {
inherit fetchurl stdenv;
};
poppler_data = import ../data/misc/poppler-data {
inherit fetchurl stdenv;
};
ttf_bitstream_vera = import ../data/fonts/ttf-bitstream-vera {
inherit fetchurl stdenv;
};
vistafonts = import ../data/fonts/vista-fonts {
inherit fetchurl stdenv cabextract;
};
xkeyboard_config = import ../data/misc/xkeyboard-config {
inherit fetchurl stdenv perl perlXMLParser;
inherit (xlibs) xkbcomp;
};
### APPLICATIONS
aangifte2005 = import ../applications/taxes/aangifte-2005 {
inherit stdenv fetchurl;
inherit (xlibs) libX11 libXext;
};
aangifte2006 = import ../applications/taxes/aangifte-2006 {
inherit stdenv fetchurl;
inherit (xlibs) libX11 libXext;
};
abiword = import ../applications/office/abiword {
inherit fetchurl stdenv pkgconfig fribidi libpng popt;
inherit (gtkLibs) gtk;
inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas;
};
acroread = import ../applications/misc/acrobat-reader {
inherit fetchurl stdenv zlib;
inherit (xlibs) libXt libXp libXext libX11 libXinerama;
inherit (gtkLibs) glib pango atk gtk;
libstdcpp5 = gcc33.gcc;
xineramaSupport = true;
fastStart = getConfig ["acroread" "fastStart"] true;
};
amsn = import ../applications/networking/instant-messengers/amsn {
inherit fetchurl stdenv which tcl tk x11;
libstdcpp = gcc33.gcc;
};
audacity = import ../applications/audio/audacity {
inherit fetchurl stdenv libogg libvorbis libsndfile libmad
pkgconfig gettext;
inherit (gtkLibs) gtk glib;
wxGTK = wxGTK28deps;
inherit builderDefs stringsWithDeps;
};
batik = import ../applications/graphics/batik {
inherit fetchurl stdenv unzip;
};
# commented out because it's using the new configuration style proposal which is unstable
#biew = import ../applications/misc/biew {
# inherit lib stdenv fetchurl ncurses;
#};
# only to be able to compile blender - I couldn't compile the default openal software
# Perhaps this can be removed - don't know which one openal{,soft} is better
freealut_soft = import ../development/libraries/freealut {
inherit fetchurl stdenv;
openal = openalSoft;
};
blender = import ../applications/misc/blender {
inherit cmake mesa gettext freetype SDL libtiff fetchurl glibc scons x11
libjpeg libpng zlib stdenv /* smpeg sdl */;
inherit (xlibs) inputproto libXi;
lib = lib_unstable;
python = builtins.getAttr "2.5" python_alts;
freealut = freealut_soft;
openal = openalSoft;
openexr = openexr_1_4_0;
};
bmp = import ../applications/audio/bmp {
inherit fetchurl stdenv pkgconfig libogg libvorbis alsaLib id3lib;
inherit (gnome) esound libglade;
inherit (gtkLibs) glib gtk;
};
bmp_plugin_musepack = import ../applications/audio/bmp-plugins/musepack {
inherit fetchurl stdenv pkgconfig bmp libmpcdec taglib;
};
bmp_plugin_wma = import ../applications/audio/bmp-plugins/wma {
inherit fetchurl stdenv pkgconfig bmp;
};
cdparanoiaIII = import ../applications/audio/cdparanoia {
inherit fetchurl stdenv;
};
cdrtools = import ../applications/misc/cdrtools {
inherit fetchurl stdenv;
};
cdrkit = import ../applications/misc/cdrkit {
inherit fetchurl stdenv cmake libcap zlib;
};
chatzilla =
xulrunnerWrapper {
launcher = "chatzilla";
application = import ../applications/networking/irc/chatzilla {
inherit fetchurl stdenv unzip;
};
};
compiz_050 = assert mesaSupported; import ../applications/window-managers/compiz/0.5.0.nix {
inherit fetchurl stdenv pkgconfig libpng mesa;
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
libXinerama libICE libSM libXrender xextproto;
inherit (gnome) startupnotification libwnck GConf;
inherit (gtkLibs) gtk;
inherit (gnome) libgnome libgnomeui metacity glib pango
libglade libgtkhtml gtkhtml libgnomecanvas libgnomeprint
libgnomeprintui gnomepanel;
gnomegtk = gnome.gtk;
inherit librsvg fuse;
};
compiz_062 = compizFun {
version = "0.6.2";
};
compizFun = lib.sumArgs (assert mesaSupported; selectVersion ../applications/window-managers/compiz) {
inherit lib builderDefs stringsWithDeps;
inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt;
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
libXinerama libICE libSM libXrender xextproto compositeproto fixesproto
damageproto randrproto xineramaproto renderproto kbproto;
inherit (gnome) startupnotification libwnck GConf;
inherit (gtkLibs) gtk;
inherit (gnome) libgnome libgnomeui metacity
glib pango libglade libgtkhtml gtkhtml
libgnomecanvas libgnomeprint
libgnomeprintui gnomepanel;
gnomegtk = gnome.gtk;
inherit librsvg fuse;
inherit dbus dbus_glib;
};
compiz = compizFun {
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
version = getConfig ["compiz" "version"] "0.6.2";
extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] [];
} null;
compizFusion = assert mesaSupported; import ../applications/window-managers/compiz-fusion {
version = getConfig ["compizFusion" "version"] "0.6.0";
inherit compiz;
inherit stringsWithDeps lib builderDefs;
inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt;
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
libXinerama libICE libSM libXrender xextproto;
inherit (gnome) startupnotification libwnck GConf;
inherit (gtkLibs) gtk;
inherit (gnome) libgnome libgnomeui metacity
glib pango libglade libgtkhtml gtkhtml
libgnomecanvas libgnomeprint
libgnomeprintui gnomepanel gnomedesktop;
gnomegtk = gnome.gtk;
inherit librsvg fuse dbus dbus_glib git;
inherit automake autoconf libtool intltool python pyrex gettext;
inherit pygtk pycairo getopt libjpeg glxinfo;
inherit (xorg) xvinfo xdpyinfo;
};
compizExtra = import ../applications/window-managers/compiz/extra.nix {
inherit fetchurl stdenv pkgconfig compiz perl perlXMLParser dbus;
inherit (gnome) GConf;
inherit (gtkLibs) gtk;
};
cua = import ../applications/editors/emacs-modes/cua {
inherit fetchurl stdenv;
};
cvs = import ../applications/version-management/cvs {
inherit fetchurl stdenv vim;
};
cvs2svn = import ../applications/version-management/cvs2svn {
inherit fetchurl stdenv python bsddb3 makeWrapper;
};
d4x = import ../applications/misc/d4x {
inherit fetchurl stdenv pkgconfig openssl boost;
inherit (gtkLibs) gtk glib;
};
darcs = import ../applications/version-management/darcs {
inherit fetchurl stdenv ghc zlib ncurses curl;
};
dia = import ../applications/graphics/dia {
inherit stdenv fetchurl pkgconfig perl perlXMLParser
libxml2 gettext python libxml2Python docbook5 docbook_xsl
libxslt;
inherit (gtkLibs) gtk glib;
};
djvulibre = import ../applications/misc/djvulibre {
inherit stdenv fetchurl libjpeg libtiff libungif zlib
ghostscript libpng x11 mesa;
qt = if (getConfig ["djvulibre" "qt3Frontend"] true) then qt3 else null;
inherit (xlibs) libX11;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
djview4 = import ../applications/graphics/djview {
inherit fetchurl stdenv qt4 djvulibre;
};
dvdplusrwtoolsFun = lib.sumArgs (selectVersion ../os-specific/linux/dvd+rw-tools) {
inherit fetchurl stdenv builderDefs cdrkit m4;
};
dvdplusrwtools = dvdplusrwtoolsFun {
version = "7.0";
} null;
eclipse = plugins:
import ../applications/editors/eclipse {
inherit fetchurl stdenv makeWrapper jdk;
inherit (gtkLibs) gtk glib;
inherit (xlibs) libXtst;
inherit plugins;
};
eclipsesdk = eclipse [];
eclipseSpoofax = lowPrio (appendToName "with-spoofax" (eclipse [spoofax]));
elinks = import ../applications/networking/browsers/elinks {
inherit stdenv fetchurl python perl ncurses x11 zlib openssl spidermonkey
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
guile bzip2;
};
emacs = emacs22;
emacs21 = import ../applications/editors/emacs-21 {
inherit fetchurl stdenv ncurses x11 Xaw3d;
inherit (xlibs) libXaw libXpm;
xaw3dSupport = true;
};
emacs22 = import ../applications/editors/emacs-22 {
inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d;
inherit (xlibs) libXaw libXpm;
inherit (gtkLibs) gtk;
xaw3dSupport = false;
gtkGUI = true;
};
emacsUnicode = import ../applications/editors/emacs-unicode {
inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d
libpng libjpeg libungif libtiff;
inherit (xlibs) libXaw libXpm libXft;
inherit (gtkLibs) gtk;
xawSupport = false;
xaw3dSupport = false;
gtkGUI = true;
xftSupport = true;
};
exrdisplay = import ../applications/graphics/exrdisplay {
inherit fetchurl stdenv pkgconfig mesa which openexr_ctl;
fltk = fltk20;
openexr = openexr_1_6_1;
};
fbpanelFun = lib.sumArgs (selectVersion ../applications/window-managers/fbpanel) {
inherit fetchurl stdenv builderDefs pkgconfig libpng libjpeg libtiff librsvg;
inherit (gtkLibs) gtk;
inherit (xlibs) libX11 libXmu libXpm;
};
fbpanel = fbpanelFun {version="4.12";} null;
fetchmail = import ../applications/misc/fetchmail {
inherit stdenv fetchurl;
};
wireshark = import ../applications/networking/sniffers/wireshark {
inherit fetchurl stdenv perl pkgconfig libpcap;
inherit (gtkLibs) gtk;
};
feh = import ../applications/graphics/feh {
inherit fetchurl stdenv x11 imlib2 libjpeg libpng;
};
firefox = lowPrio (import ../applications/networking/browsers/firefox {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
inherit (gtkLibs) gtk;
inherit (gnome) libIDL;
inherit (xlibs) libXi;
#enableOfficialBranding = true;
});
firefoxWrapper = wrapFirefox firefox "";
firefox3b1 = lowPrio (import ../applications/networking/browsers/firefox3b1 {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
python curl coreutils;
inherit (gtkLibs) gtk;
inherit (gnome) libIDL;
inherit (xlibs) libXi;
#enableOfficialBranding = true;
});
firefox3b2 = lowPrio (import ../applications/networking/browsers/firefox3b1/3b2.nix {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
python curl coreutils dbus dbus_glib freetype fontconfig;
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
inherit (xlibs) libXi libX11 libXrender libXft libXt;
#enableOfficialBranding = true;
});
firefox3b1Bin = lowPrio (import ../applications/networking/browsers/firefox3b1/binary.nix {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
python curl coreutils freetype fontconfig;
inherit (gtkLibs) gtk atk pango glib;
inherit (gnome) libIDL;
inherit (xlibs) libXi libX11 libXrender libXft libXt;
});
firefox3b1Wrapper = lowPrio (wrapFirefox firefox3b1 "");
firefox3b1BinWrapper = lowPrio (wrapFirefox firefox3b1Bin "");
flacAlts = import ../applications/audio/flac {
inherit fetchurl stdenv libogg;
};
flac = getVersion "flac" flacAlts;
flashplayer = flashplayer9;
flashplayer7 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-7 {
inherit fetchurl stdenv zlib;
inherit (xlibs) libXmu;
};
flashplayer9 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
inherit fetchurl stdenv zlib alsaLib;
};
flite = import ../applications/misc/flite {
inherit fetchurl stdenv;
};
freemind = import ../applications/misc/freemind {
inherit fetchurl stdenv ant;
jdk = jdk;
jre = jdk;
};
fspot = import ../applications/graphics/f-spot {
inherit fetchurl stdenv perl perlXMLParser pkgconfig mono
libexif libjpeg sqlite lcms libgphoto2 monoDLLFixer;
inherit (gnome) libgnome libgnomeui;
gtksharp = gtksharp1;
};
pidgin = import ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell GStreamer aspell gettext ncurses;
inherit (gtkLibs) gtk;
inherit (gnome) startupnotification;
inherit (xlibs) libXScrnSaver;
};
pidginlatex = import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
inherit fetchurl stdenv tetex pkgconfig ghostscript pidgin;
imagemagick = imagemagickBig;
inherit (gtkLibs) glib gtk;
};
pidginotr = import ../applications/networking/instant-messengers/pidgin-plugins/otr {
inherit fetchurl stdenv libotr pidgin;
};
gimp = import ../applications/graphics/gimp {
inherit fetchurl stdenv pkgconfig freetype fontconfig
libtiff libjpeg libpng libexif zlib perl perlXMLParser
python pygtk gettext xlibs;
inherit (gnome) gtk libgtkhtml libart_lgpl;
};
git = import ../applications/version-management/git {
inherit fetchurl stdenv curl openssl zlib expat perl;
};
gnash = assert mesaSupported; import ../applications/video/gnash {
inherit fetchurl stdenv SDL SDL_mixer GStreamer
libogg libxml2 libjpeg mesa libpng;
inherit (xlibs) libX11 libXext libXi libXmu;
};
gocrFun = lib.sumArgs (selectVersion ../applications/graphics/gocr) {
inherit builderDefs fetchurl stdenv;
};
gocr = gocrFun {version = "0.44";} null;
gphoto2 = import ../applications/misc/gphoto2 {
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt readline gettext;
};
gqview = import ../applications/graphics/gqview {
inherit fetchurl stdenv pkgconfig libpng;
inherit (gtkLibs) gtk;
};
GStreamer = import ../applications/audio/GStreamer {
inherit fetchurl stdenv perl bison flex pkgconfig libxml2;
inherit (gtkLibs) glib;
};
gv = import ../applications/misc/gv {
inherit fetchurl stdenv Xaw3d ghostscriptX;
};
haskellMode = import ../applications/editors/emacs-modes/haskell {
inherit fetchurl stdenv;
};
hello = import ../applications/misc/hello/ex-1 {
inherit fetchurl stdenv perl;
};
i810switch = import ../applications/misc/i810 {
inherit fetchurl stdenv pciutils;
};
icewm = import ../applications/window-managers/icewm {
inherit fetchurl stdenv gettext libjpeg libtiff libungif libpng imlib;
inherit (xlibs) libX11 libXft libXext libXinerama libXrandr;
};
imagemagickFun = lib.sumArgs (import ../applications/graphics/ImageMagick) {
inherit stdenv fetchurl libtool;
};
imagemagick = imagemagickFun {
inherit bzip2 freetype graphviz ghostscript libjpeg libpng libtiff
libxml2 zlib;
inherit (xlibs) libX11;
} null;
imagemagickBig = imagemagickFun {
inherit bzip2 freetype graphviz ghostscript libjpeg libpng libtiff
libxml2 zlib tetex librsvg;
inherit (xlibs) libX11;
} null;
inkscape = import ../applications/graphics/inkscape {
inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
popt libxml2 libxslt libpng boehmgc fontconfig gtkmm
glibmm libsigcxx lcms boost gettext;
inherit (gtkLibs) gtk glib;
inherit (xlibs) libXft;
};
ion3 = import ../applications/window-managers/ion-3 {
inherit fetchurl stdenv x11 gettext groff;
lua = lua5;
};
irssi = import ../applications/networking/irc/irssi {
inherit stdenv fetchurl pkgconfig ncurses openssl;
inherit (gtkLibs) glib;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
jedit = import ../applications/jedit {
inherit fetchurl ant stdenv;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
};
joe = import ../applications/editors/joe {
inherit stdenv fetchurl;
};
kino = import ../applications/video/kino {
inherit fetchurl pkgconfig libxml2 perl perlXMLParser stdenv
libdv libraw1394 libavc1394 libiec61883 x11 gettext cairo; /* libavformat */
inherit libsamplerate ffmpeg;
inherit (gnome) libglade gtk glib;
inherit (xlibs) libXv libX11;
inherit (gtkLibs) pango;
# # optional
# inherit ffmpeg2theora sox, vorbis-tools lame mjpegtools dvdauthor 'Q'dvdauthor growisofs mencoder;
};
kuickshow = import ../applications/graphics/kuickshow {
inherit fetchurl stdenv kdelibs arts libpng libjpeg libtiff libungif imlib expat perl;
inherit (xlibs) libX11 libXext libSM;
qt = qt3;
};
lame = import ../applications/audio/lame {
inherit fetchurl stdenv ;
};
ladspaH = import ../applications/audio/ladspa-plugins/ladspah.nix {
inherit fetchurl stdenv builderDefs stringsWithDeps;
};
ladspaPlugins = import ../applications/audio/ladspa-plugins {
inherit fetchurl stdenv builderDefs stringsWithDeps fftw ladspaH pkgconfig;
};
links = import ../applications/networking/browsers/links {
inherit fetchurl stdenv;
};
lynx = import ../applications/networking/browsers/lynx {
inherit fetchurl stdenv ncurses openssl;
};
maxima = import ../applications/misc/maxima {
inherit fetchurl stdenv clisp;
};
mercurial = import ../applications/version-management/mercurial {
inherit fetchurl stdenv python makeWrapper;
};
monodevelop = import ../applications/editors/monodevelop {
inherit fetchurl stdenv file mono gtksourceviewsharp
gtkmozembedsharp monodoc perl perlXMLParser pkgconfig;
inherit (gnome) gnomevfs libbonobo libglade libgnome GConf glib gtk;
mozilla = firefox;
gtksharp = gtksharp2;
};
monodoc = import ../applications/editors/monodoc {
inherit fetchurl stdenv mono pkgconfig;
gtksharp = gtksharp1;
};
mozilla = import ../applications/networking/browsers/mozilla {
inherit fetchurl pkgconfig stdenv perl zip;
inherit (gtkLibs) gtk;
inherit (gnome) libIDL;
inherit (xlibs) libXi;
};
MPlayer = import ../applications/video/MPlayer {
inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav;
inherit (xlibs) libX11 libXv libXinerama libXrandr;
alsaSupport = true;
alsa = alsaLib;
theoraSupport = true;
cacaSupport = true;
xineramaSupport = true;
randrSupport = true;
};
# commented out because it's using the new configuration style proposal which is unstable
# should be the same as the nix expression above except support for esound :)
/*
MPlayer_new_config = import ../applications/video/MPlayer/newconfig.nix {
inherit fetchurl stdenv freetype x11 zlib freefont_ttf lib;
inherit (xlibs) libX11 xextproto;
# optional features
inherit alsaLib libtheora libcaca;
inherit (gnome) esound;
inherit (xlibs) libXv libXinerama;
inherit (xlibs) libXrandr; # FIXME does this option exist? I couldn't find it as configure option
};
*/
MPlayerPlugin = import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
inherit fetchurl stdenv pkgconfig firefox gettext;
inherit (xlibs) libXpm;
# !!! should depend on MPlayer
};
# commented out because it's using the new configuration style proposal which is unstable
#mrxvt = import ../applications/misc/mrxvt {
#inherit lib fetchurl stdenv;
#inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
#};
mutt = import ../applications/networking/mailreaders/mutt {
inherit fetchurl stdenv ncurses which openssl;
};
msmtp = import ../applications/networking/msmtp {
inherit fetchurl stdenv;
};
mythtv = import ../applications/video/mythtv {
inherit fetchurl stdenv which qt3 x11 lame zlib mesa;
inherit (xlibs) libX11 libXinerama libXv libXxf86vm libXrandr libXmu;
};
nano = import ../applications/editors/nano {
inherit fetchurl stdenv ncurses gettext;
};
nanoDiet = lowPrio (appendToName "diet" (import ../applications/editors/nano {
inherit fetchurl gettext;
ncurses = ncursesDiet;
stdenv = useDietLibC stdenv;
}));
nedit = import ../applications/editors/nedit {
inherit fetchurl stdenv x11;
inherit (xlibs) libXpm;
motif = lesstif;
};
nxml = import ../applications/editors/emacs-modes/nxml {
inherit fetchurl stdenv;
};
openoffice = import ../applications/office/openoffice {
inherit fetchurl stdenv pam python tcsh libxslt
perl perlArchiveZip perlCompressZlib zlib libjpeg
expat pkgconfig freetype fontconfig libwpd libxml2
db4 sablotron curl libsndfile flex zip unzip libmspack
getopt file neon cairo which icu boost jdk ant hsqldb
cups;
inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
inherit (gtkLibs) gtk;
bison = bison23;
};
opera = import ../applications/networking/browsers/opera {
inherit fetchurl zlib glibc;
stdenv = overrideGCC stdenv gcc40;
inherit (xlibs) libX11 libSM libICE libXt libXext;
qt = qt3;
#33motif = lesstif;
libstdcpp5 = (if (stdenv.system == "i686-linux") then gcc33 /* stdc++ 3.8 is used */ else gcc).gcc;
};
pan = import ../applications/networking/newsreaders/pan {
inherit fetchurl stdenv pkgconfig perl pcre gmime gettext;
inherit (gtkLibs) gtk;
spellChecking = false;
};
pinfo = import ../applications/misc/pinfo {
inherit fetchurl stdenv ncurses readline;
};
# perhaps there are better apps for this task? It's how I had configured my preivous system.
# And I don't want to rewrite all rules
procmail = import ../applications/misc/procmail {
inherit fetchurl stdenv autoconf;
};
pstree = import ../applications/misc/pstree {
inherit stdenv fetchurl;
};
pythonmagick = import ../applications/graphics/PythonMagick {
inherit fetchurl stdenv pkgconfig imagemagick boost;
python = builtins.getAttr "2.5" python_alts;
};
qemuFun = lib.sumArgs (selectVersion ../applications/virtualization/qemu ) {
inherit fetchurl;
stdenv = overrideGCC stdenv gcc34;
builderDefs = builderDefs {
stdenv = (overrideGCC stdenv gcc34)//{gcc=gcc34;};
};
inherit SDL zlib which;
};
qemu = qemuFun {
version = "0.9.0";
} null;
qemuImageFun = lib.sumArgs
(selectVersion ../applications/virtualization/qemu/linux-img ) {
inherit builderDefs fetchurl stdenv;
};
qemuImage = qemuImageFun {
version = "0.2";
} null;
ratpoison = import ../applications/window-managers/ratpoison {
inherit fetchurl stdenv fontconfig readline;
inherit (xlibs) libX11 inputproto libXt libXpm libXft
libXtst xextproto;
};
rcs = import ../applications/version-management/rcs {
inherit fetchurl stdenv;
};
RealPlayer = import ../applications/video/RealPlayer {
inherit fetchurl stdenv;
inherit (gtkLibs) glib pango atk gtk;
inherit (xlibs) libX11;
libstdcpp5 = gcc33.gcc;
};
rsync = import ../applications/networking/sync/rsync {
inherit fetchurl stdenv;
};
rxvt = import ../applications/misc/rxvt {
inherit lib fetchurl stdenv;
inherit (xlibs) libXt libX11;
};
# = urxvt
rxvt_unicode = import ../applications/misc/rxvt_unicode {
inherit lib fetchurl stdenv perl;
inherit (xlibs) libXt libX11 libXft;
};
sbagen = import ../applications/misc/sbagen {
inherit fetchurl stdenv;
};
skype_linux = import ../applications/networking/skype {
inherit fetchurl stdenv;
inherit glibc alsaLib freetype fontconfig libsigcxx gcc41;
inherit (xlibs) libSM libICE libXi libXrender libXrandr libXfixes libXcursor
libXinerama libXext libX11;
};
slim = import ../applications/display-managers/slim {
inherit fetchurl stdenv x11 libjpeg libpng freetype pam;
inherit (xlibs) libXmu;
};
sndFun = lib.sumArgs (import ../applications/audio/snd) {
inherit fetchurl stdenv builderDefs stringsWithDeps lib;
inherit pkgconfig gmp gettext;
inherit (xlibs) libXpm;
inherit (gtkLibs) gtk glib;
};
snd = sndFun {
inherit guile mesa libtool;
} null;
# commented out because it's using the new configuration style proposal which is unstable
sox = if builtins ? listToAttrs then import ../applications/misc/audio/sox {
inherit fetchurl stdenv lib mkDerivationByConfiguration;
# optional features
inherit alsaLib; # libao
inherit libsndfile libogg flac libmad lame libsamplerate;
# Using the default nix ffmpeg I get this error when linking
# .libs/libsox_la-ffmpeg.o: In function `audio_decode_frame':
# /tmp/nix-7957-1/sox-14.0.0/src/ffmpeg.c:130: undefined reference to `avcodec_decode_audio2
# That's why I'v added ffmpeg_svn
ffmpeg = ffmpeg_svn;
} else null;
spoofax = import ../applications/editors/eclipse/plugins/spoofax {
inherit fetchurl stdenv;
};
subversion = subversion14;
subversion13 = import ../applications/version-management/subversion-1.3.x {
inherit fetchurl stdenv openssl db4 expat swig zlib;
localServer = true;
httpServer = false;
sslSupport = true;
compressionSupport = true;
httpd = apacheHttpd;
};
subversion14 = import ../applications/version-management/subversion-1.4.x {
inherit fetchurl stdenv apr aprutil neon expat swig zlib;
bdbSupport = true;
httpServer = false;
perlBindings = getConfig ["subversion" "perlBindings"] false;
sslSupport = true;
compressionSupport = true;
httpd = apacheHttpd;
};
subversionWithJava = import ../applications/version-management/subversion-1.2.x {
inherit fetchurl stdenv openssl db4 expat jdk;
swig = swigWithJava;
localServer = true;
httpServer = false;
sslSupport = true;
httpd = apacheHttpd;
javahlBindings = true;
};
sylpheed = import ../applications/networking/mailreaders/sylpheed {
inherit fetchurl stdenv pkgconfig openssl gpgme;
inherit (gtkLibs) gtk;
sslSupport = true;
gpgSupport = true;
};
# linux only by now
synergy = import ../applications/misc/synergy {
inherit fetchcvs stdenv x11;
inherit (xlibs) xextproto libXtst inputproto;
};
/* does'nt work yet i686-linux only (32bit version)
teamspeak_client = import ../applications/networking/instant-messengers/teamspeak/client.nix {
inherit fetchurl stdenv;
inherit glibc x11;
};
*/
thunderbird = import ../applications/networking/mailreaders/thunderbird-2.x {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
inherit (gtkLibs) gtk;
inherit (gnome) libIDL;
inherit (xlibs) libXi;
#enableOfficialBranding = true;
};
timidity = import ../tools/misc/timidity {
inherit fetchurl stdenv alsaLib;
};
unison = import ../applications/networking/sync/unison {
inherit fetchurl stdenv ocaml lablgtk makeWrapper;
inherit (xorg) xset fontschumachermisc;
};
valknut = import ../applications/networking/p2p/valknut {
inherit fetchurl stdenv perl x11 libxml2 libjpeg libpng openssl dclib;
qt = qt3;
};
vim = import ../applications/editors/vim {
inherit fetchurl stdenv ncurses lib;
};
vimDiet = lowPrio (appendToName "diet" (import ../applications/editors/vim-diet {
inherit fetchurl;
ncurses = ncursesDiet;
stdenv = useDietLibC stdenv;
}));
vimHugeX = import ../applications/editors/vim {
inherit fetchurl stdenv lib ncurses pkgconfig
perl python tcl;
inherit (xlibs) libX11 libXext libSM libXpm
libXt libXaw libXau;
inherit (gtkLibs) glib gtk;
# Looks like python and perl can conflict
flags = ["hugeFeatures" "gtkGUI" "x11Support"
/*"perlSupport"*/ "pythonSupport" "tclSupport"];
};
vim_configurable = import ../applications/editors/vim/configurable.nix {
inherit fetchurl stdenv ncurses pkgconfig mkDerivationByConfiguration;
inherit (xlibs) libX11 libXext libSM libXpm
libXt libXaw libXau libXmu;
inherit (gtkLibs) glib gtk;
lib = lib_unstable;
features = "huge"; # one of tiny, small, normal, big or huge
# optional features by passing
# python
# TODO mzschemeinterp perlinterp
inherit python /*x11*/;
# optional features by flags
flags = [ "X11" ]; # only flag "X11" by now
};
/*virtualboxFun = lib.sumArgs (selectVersion ../applications/virtualization/virtualbox) {
inherit stdenv fetchurl builderDefs bridge_utils umlutilities kernelHeaders
wine jre libxslt SDL qt3 openssl zlib;
inherit (xorg) libXcursor;
inherit (gnome) libIDL;
};
virtualbox = virtualboxFun {
version = "1.5.2";
} null;*/
vlc = import ../applications/video/vlc {
inherit fetchurl stdenv perl x11 wxGTK
zlib mpeg2dec a52dec libmad ffmpeg
libdvdread libdvdnav libdvdcss;
inherit (xlibs) libXv;
alsa = alsaLib;
};
w3m = import ../applications/networking/browsers/w3m {
inherit fetchurl stdenv ncurses openssl boehmgc gettext zlib;
graphicsSupport = false;
inherit (gtkLibs1x) gdkpixbuf;
};
# I'm keen on wmiimenu only >wmii-3.5 no longer has it...
wmiimenu = import ../applications/window-managers/wmii31 {
libixp = libixp03;
inherit fetchurl /* fetchhg */ stdenv gawk;
inherit (xlibs) libX11;
includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
};
wmiiSnap = import ../applications/window-managers/wmii {
libixp = libixp_for_wmii;
inherit fetchurl /* fetchhg */ stdenv gawk;
inherit (xlibs) libX11;
includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
};
wrapFirefox = firefox: nameSuffix: import ../applications/networking/browsers/firefox-wrapper {
inherit stdenv firefox nameSuffix;
plugins = []
++ lib.optional (system == "i686-linux") flashplayer
# RealPlayer is disabled by default for legal reasons.
++ lib.optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer
++ lib.optional (getConfig ["firefox" "enableMPlayer"] true) MPlayerPlugin
++ lib.optional (supportsJDK && jrePlugin ? mozillaPlugin) jrePlugin;
};
xara = import ../applications/graphics/xara {
inherit fetchurl stdenv autoconf automake libtool gettext cvs wxGTK
pkgconfig libxml2 zip libpng libjpeg shebangfix perl freetype;
inherit (gtkLibs) gtk;
};
xawtv = import ../applications/video/xawtv {
inherit fetchurl stdenv ncurses libjpeg perl;
inherit (xlibs) libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE xextproto;
};
xchat = import ../applications/networking/irc/xchat {
inherit fetchurl stdenv pkgconfig tcl;
inherit (gtkLibs) gtk;
};
xchm = import ../applications/misc/xchm {
inherit fetchurl stdenv wxGTK chmlib;
};
xfig = import ../applications/graphics/xfig {
stdenv = overrideGCC stdenv gcc34;
inherit fetchurl makeWrapper x11 Xaw3d libpng libjpeg;
inherit (xlibs) imake libXpm libXmu libXi libXp;
};
xineUI = import ../applications/video/xine-ui {
inherit fetchurl stdenv pkgconfig x11 xineLib libpng readline ncurses curl;
inherit (xorg) libXext libXv libXxf86vm libXtst inputproto;
};
xmms = import ../applications/audio/xmms {
inherit fetchurl libogg libvorbis alsaLib;
inherit (gnome) esound;
inherit (gtkLibs1x) glib gtk;
stdenv = overrideGCC stdenv gcc34; # due to problems with gcc 4.x
};
xpdf = import ../applications/misc/xpdf {
inherit fetchurl stdenv x11 freetype t1lib;
motif = lesstif;
base14Fonts = "${ghostscript}/share/ghostscript/fonts";
};
xscreensaverFun = lib.sumArgs (selectVersion ../applications/graphics/xscreensaver) {
inherit stdenv fetchurl builderDefs lib pkgconfig bc perl intltool;
inherit (xlibs) libX11 libXmu;
};
xscreensaver = xscreensaverFun {
version = "5.04";
flags = ["GL" "gdkpixbuf" "DPMS" "gui" "jpeg"];
inherit mesa libxml2 libjpeg;
inherit (gtkLibs) gtk;
inherit (gnome) libglade;
} null;
xterm = import ../applications/misc/xterm {
inherit fetchurl stdenv ncurses;
inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
};
xlaunch = import ../tools/X11/xlaunch {
inherit stdenv;
inherit (xorg) xorgserver;
};
xmacro = import ../tools/X11/xmacro {
inherit fetchurl stdenv;
inherit (xlibs) libX11 libXi
libXtst xextproto inputproto;
};
xmove = import ../applications/misc/xmove {
inherit fetchurl stdenv;
inherit (xlibs) libX11 libXi imake libXau;
inherit (xorg) xauth;
};
xvidcap = import ../applications/video/xvidcap {
inherit fetchurl stdenv perl perlXMLParser pkgconfig;
inherit (gtkLibs) gtk;
inherit (gnome) scrollkeeper libglade;
inherit (xlibs) libXmu libXext;
};
# doesn't compile yet - in case someone else want's to continue ..
/*
qgis_svn = import ../applications/misc/qgis_svn {
lib = lib_unstable;
inherit mkDerivationByConfiguration fetchsvn flex
ncurses fetchurl perl cmake gdal geos proj x11
gsl libpng zlib stdenv
sqlite glibc fontconfig freetype;
inherit (xlibs) libSM libXcursor libXinerama libXrandr libXrender;
inherit (xorg) libICE;
qt = qt4;
bison = bison23;
# optional features
# grass = "not yet supported" # cmake -D WITH_GRASS=TRUE and GRASS_PREFX=..
};
*/
zapping = import ../applications/video/zapping {
inherit fetchurl stdenv pkgconfig perl python
gettext zvbi libjpeg libpng x11
rte perlXMLParser;
inherit (gnome) scrollkeeper libgnomeui libglade esound;
inherit (xlibs) libXv libXmu libXext;
teletextSupport = true;
jpegSupport = true;
pngSupport = true;
recordingSupport = true;
};
### GAMES
construoFun = lib.sumArgs (selectVersion ../games/construo) {
inherit stdenv fetchurl builderDefs
zlib;
inherit (xlibs) libX11 xproto;
};
construo = construoFun {
inherit mesa freeglut;
version = "0.2.2";
} null;
exult = import ../games/exult {
inherit fetchurl SDL SDL_mixer zlib libpng unzip;
stdenv = overrideGCC stdenv gcc34;
};
fsg = import ../games/fsg {
inherit stdenv fetchurl pkgconfig;
inherit (gtkLibs) glib gtk;
wxGTK = wxGTK28deps {unicode = false;};
};
fsgAltBuild = import ../games/fsg/alt-builder.nix {
inherit stdenv fetchurl;
wxGTK = wxGTK28deps {unicode = false;};
stringsWithDeps = import ../lib/strings-with-deps.nix {
inherit stdenv lib;
};
inherit builderDefs;
};
gemrb = import ../games/gemrb {
inherit fetchurl stdenv SDL openal freealut zlib libpng python;
};
quake3demo = import ../games/quake3/wrapper {
name = "quake3-demo";
description = "Demo of Quake 3 Arena, a classic first-person shooter";
inherit fetchurl stdenv mesa;
game = quake3game;
paks = [quake3demodata];
};
quake3demodata = import ../games/quake3/demo {
inherit fetchurl stdenv;
};
quake3game = import ../games/quake3/game {
inherit fetchurl stdenv x11 SDL mesa openal;
};
rogue = import ../games/rogue {
inherit fetchurl stdenv ncurses;
};
scummvm = import ../games/scummvm {
inherit fetchurl stdenv SDL zlib mpeg2dec;
};
/*tpm = import ../games/thePenguinMachine {
inherit stdenv fetchurl pil pygame SDL;
python24 = python;
};*/
ut2004demo = import ../games/ut2004demo {
inherit fetchurl stdenv xlibs mesa;
};
zoom = import ../games/zoom {
inherit fetchurl stdenv perl expat freetype;
inherit (xlibs) xlibs;
};
keen4 = import ../games/keen4 {
inherit fetchurl stdenv dosbox unzip;
};
### DESKTOP ENVIRONMENTS
gnome = recurseIntoAttrs (import ../desktops/gnome {
inherit fetchurl stdenv pkgconfig audiofile
flex bison popt zlib libxml2 libxslt
perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412
gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
libcm python dbus_glib ncurses which libxml2Python
iconnamingutils;
});
kdelibs = import ../desktops/kde/kdelibs {
inherit
fetchurl stdenv zlib perl openssl pcre pkgconfig
libjpeg libpng libtiff libxml2 libxslt libtool
expat freetype bzip2 cups;
inherit (xlibs) libX11 libXt libXext;
qt = qt3;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
kde4 = recurseIntoAttrs (import ../desktops/kde-4 {
inherit
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
fetchurl fetchsvn zlib perl openssl pcre pkgconfig libjpeg libpng libtiff
libxml2 libxslt libtool libusb expat freetype bzip2 cmake cluceneCore libgcrypt gnupg
cppunit cyrus_sasl openldap enchant exiv2 samba nss log4cxx aspell kerberos
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland
xineLib libgphoto2 djvulibre libogg lame libvorbis poppler readline
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
saneBackends chmlib python libzip gmp sqlite libidn runCommand lib
openbabel ocaml facile stdenv jasper fam indilib libnova
libarchive;
flac = builtins.getAttr "1.1.2" flacAlts;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
cdparanoia = cdparanoiaIII;
inherit (xlibs)
inputproto kbproto scrnsaverproto xextproto xf86miscproto
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
libxkbfile libXinerama libpthreadstubs libXxf86vm xset xprop;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
inherit (gtkLibs) glib;
qt = qt4;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
dbus = dbus_alts.withX11;
bison = bison23;
openexr = openexr_1_6_1 ;
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
});
kdebase = import ../desktops/kde/kdebase {
inherit
fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl
kdelibs openssl bzip2 fontconfig;
qt = qt3;
};
### MISC
atari800 = import ../misc/emulators/atari800 {
inherit fetchurl stdenv unzip zlib SDL;
};
ataripp = import ../misc/emulators/atari++ {
inherit fetchurl stdenv x11 SDL;
};
auctex = import ../misc/tex/auctex {
inherit stdenv fetchurl emacs tetex;
};
busybox = import ../misc/busybox {
inherit fetchurl stdenv;
};
cups = import ../misc/cups {
inherit fetchurl stdenv zlib libjpeg libpng libtiff pam;
};
dblatex = import ../misc/tex/dblatex {
inherit fetchurl stdenv python libxslt tetex;
};
dosbox = import ../misc/emulators/dosbox {
inherit fetchurl stdenv SDL;
};
generator = import ../misc/emulators/generator {
inherit fetchurl stdenv SDL nasm zlib bzip2 libjpeg;
inherit (gtkLibs1x) gtk;
};
ghostscript = import ../misc/ghostscript {
inherit fetchurl stdenv libjpeg libpng zlib x11;
x11Support = false;
};
ghostscriptX = lowPrio (appendToName "with-X" (import ../misc/ghostscript {
inherit fetchurl stdenv libjpeg libpng zlib x11;
x11Support = true;
}));
# commented out because it's using the new configuration style proposal which is unstable
#gxemul = (import ../misc/gxemul) {
#inherit lib stdenv fetchurl;
#inherit (xlibs) libX11;
#};
# using the new configuration style proposal which is unstable
/*
jackaudio = import ../misc/jackaudio {
inherit mkDerivationByConfiguration
ncurses lib stdenv fetchurl;
flags = [ "posix_shm" "timestamps"];
};
*/
keynav = import ../tools/X11/keynav {
inherit stdenv fetchurl;
inherit (xlibs) libX11 xextproto libXtst
imake libXi libXext;
};
lazylist = import ../misc/tex/lazylist {
inherit fetchurl stdenv tetex;
};
linuxwacom = import ../misc/linuxwacom {
inherit fetchurl stdenv;
inherit (xlibs) libX11 libXi;
};
martyr = import ../development/libraries/martyr {
inherit stdenv fetchurl apacheAnt;
};
maven = import ../misc/maven/maven-1.0.nix {
inherit stdenv fetchurl jdk;
};
# don't have time for the source build right now
# maven2
mvn_bin = import ../misc/maven/maven-2.nix {
inherit fetchurl stdenv;
};
nix = import ../tools/package-management/nix {
inherit fetchurl stdenv perl curl bzip2 openssl;
aterm = aterm242fixes;
db4 = db45;
};
nixStatic = import ../tools/package-management/nix-static {
inherit fetchurl stdenv perl curl autoconf automake libtool;
aterm = aterm242fixes;
bdb = db4;
};
# The bleeding edge.
nixUnstable = import ../tools/package-management/nix/unstable.nix {
inherit fetchurl stdenv perl curl bzip2 openssl;
aterm = aterm242fixes;
db4 = db45;
};
Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb> Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 22:05:15 +01:00
nixCustomFun = src: preConfigure: configureFlags :
(import ../tools/package-management/nix/custom.nix {
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
autoconf libtool configureFlags;
bison = bison23;
flex = flex2533;
aterm = aterm242fixes;
db4 = db45;
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
});
ntfs3g = import ../misc/ntfs-3g {
inherit fetchurl stdenv fuse pkgconfig;
};
ntfsprogs = import ../misc/ntfsprogs {
inherit fetchurl stdenv;
};
pgf = import ../misc/tex/pgf {
inherit fetchurl stdenv;
};
polytable = import ../misc/tex/polytable {
inherit fetchurl stdenv tetex lazylist;
};
putty = import ../applications/networking/remote/putty {
inherit stdenv fetchurl ncurses;
inherit (gtkLibs1x) gtk;
};
rssglx = import ../misc/screensavers/rss-glx {
inherit fetchurl stdenv x11 mesa;
};
saneBackends = import ../misc/sane-backends {
inherit fetchurl stdenv libusb;
gt68xxFirmware =
getConfig ["sane" "gt68xxFirmware"] null;
};
saneFrontends = import ../misc/sane-front {
inherit fetchurl stdenv pkgconfig libusb
saneBackends;
inherit (gtkLibs) gtk;
inherit (xlibs) libX11;
};
synaptics = import ../misc/synaptics {
inherit fetchurl stdenv pkgconfig;
inherit (xlibs) libX11 libXi libXext pixman xf86inputevdev;
inherit (xorg) xorgserver;
};
tetex = import ../misc/tex/tetex {
inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
};
texFunctions = import ../misc/tex/nix {
inherit stdenv perl tetex graphviz ghostscript;
};
toolbuslib = import ../development/libraries/toolbuslib {
inherit stdenv fetchurl aterm;
};
trac = import ../misc/trac {
inherit stdenv fetchurl python clearsilver makeWrapper sqlite;
subversion = import ../applications/version-management/subversion-1.3.x {
inherit fetchurl stdenv openssl db4 expat jdk swig zlib;
localServer = true;
httpServer = false;
sslSupport = true;
compressionSupport = true;
httpd = apacheHttpd;
pythonBindings = true; # Enable python bindings
};
pysqlite = import ../development/libraries/pysqlite {
inherit stdenv fetchurl python sqlite;
};
};
wine = import ../misc/emulators/wine {
inherit fetchurl stdenv flex bison mesa ncurses
libpng libjpeg alsaLib lcms xlibs freetype
fontconfig fontforge;
};
xsane = import ../misc/xsane {
inherit fetchurl stdenv pkgconfig libusb
saneBackends saneFrontends;
inherit (gtkLibs) gtk;
inherit (xlibs) libX11;
};
}