public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=25993
This commit is contained in:
Eelco Dolstra 2011-02-16 15:14:04 +00:00
commit 9b6dfe840a
55 changed files with 934 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/kde-4.5/utils/wacomtablet.nix → pkgs/applications/misc/kde-wacomtablet/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, automoc4, cmake, kdelibs, qt4 }: { stdenv, fetchurl, automoc4, cmake, kdelibs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wacomtablet"; name = "wacomtablet-1.2.5";
version = "1.2.5";
src = fetchurl { src = fetchurl {
url = "http://kde-apps.org/CONTENT/content-files/114856-${name}-${version}.tar.gz"; url = "http://kde-apps.org/CONTENT/content-files/114856-${name}.tar.gz";
sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf"; sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf";
}; };
buildInputs = [ automoc4 cmake kdelibs qt4 ]; buildInputs = [ automoc4 cmake kdelibs ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "KDE Wacom graphic tablet configuration tool"; description = "KDE Wacom graphic tablet configuration tool";
license = "GPLv2"; license = "GPLv2";
homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856; homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.goibhniu maintainers.urkud ];
}; };
} }

15
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -8,17 +8,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chrome-${version}"; name = "chrome-${version}";
version = "70357"; version = "74731";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = http://build.chromium.org/f/chromium/continuous/linux64/2011-01-02/70375/chrome-linux.zip; url = "http://build.chromium.org/f/chromium/continuous/linux64/2011-02-12/${version}/chrome-linux.zip";
sha256 = "0zz9pl1ksiwk5kcsa5isviacg8awzs2gmirg8n36qni07dj5wiq8"; sha256 = "1g1xi8l02mv53r7g3x6w93i0rqdx09k8x7bypm9g51w315k6yssj";
} }
else if stdenv.system == "i686-linux" then else if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = http://build.chromium.org/f/chromium/continuous/linux/2011-01-02/70375/chrome-linux.zip; url = "http://build.chromium.org/f/chromium/continuous/linux/2011-02-12/${version}/chrome-linux.zip";
sha256 = "1i7sb6wgf19zr97r2s5n0p4543i736n8c2hnhk483hjzikg2j55i"; sha256 = "163z2b7c7plf0ys18mj0g5ppkdfw9sr8i089hy2h7l0xscp18s11";
} }
else throw "Chromium is not supported on this platform."; else throw "Chromium is not supported on this platform.";
@ -51,7 +51,10 @@ stdenv.mkDerivation rec {
ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
''; '';
meta = { meta = with stdenv.lib; {
description = "Chromium, an open source web browser"; description = "Chromium, an open source web browser";
homepage = http://www.chromium.org/;
maintainers = [ maintainers.goibhniu ];
license = licenses.bsd3;
}; };
} }

24
pkgs/applications/networking/mailreaders/notmuch/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ fetchgit, stdenv, emacs, glib, gmime, pkgconfig, talloc, xapian }:
stdenv.mkDerivation rec {
name = "notmuch-0.5-20110203";
src = fetchgit {
url = "git://notmuchmail.org/git/notmuch";
rev = "62725a5b59625c164512465af5b3912396b61e8b";
sha256 = "39b339f47cee1938d76e046cccfd7c3e5e5d37a578e40007a5d43adfc4cd41ce";
};
buildInputs = [ emacs glib gmime pkgconfig talloc xapian ];
meta = {
description = "Notmuch -- The mail indexer";
longDescription = "";
license = "GPLv3";
maintainers = [ stdenv.lib.maintainers.chaoflow ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

12
pkgs/applications/networking/mumble/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile, { stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
avahi }: avahi, dbus, libcap }:
throw "It does not build still. It wants dns_sd.h"
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mumble-" + version; name = "mumble-" + version;
@ -17,9 +15,13 @@ stdenv.mkDerivation rec {
sed -e /qt_ja_JP.qm/d -i src/mumble/mumble_qt.qrc src/mumble11x/mumble_qt.qrc sed -e /qt_ja_JP.qm/d -i src/mumble/mumble_qt.qrc src/mumble11x/mumble_qt.qrc
''; '';
configurePhase = "qmake PREFIX=$out"; configurePhase = ''
qmake PREFIX=$out CONFIG+=no-g15 CONFIG+=no-update \
CONFIG+=no-embed-qt-translations CONFIG+=no-ice
'';
buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi ]; buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus
libcap ];
meta = { meta = {
homepage = http://mumble.sourceforge.net/; homepage = http://mumble.sourceforge.net/;

40
pkgs/applications/video/mkvtoolnix/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ stdenv, fetchurl
, libmatroska
, flac
, libvorbis
, file
, boost
, lzo
, xdg_utils
, expat
, wxGTK
, zlib
, ruby
, gettext
}:
stdenv.mkDerivation rec {
name = "mkvtoolnix-4.4.0";
src = fetchurl {
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2";
sha256 = "0apgmah1d4dh5x1phr4n5vgwmy0w1nym9pydzh4kdgcs167l8n6l";
};
buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext ];
configureFlags = "--with-boost-libdir=${boost}/lib";
buildPhase = ''
ruby ./drake
'';
installPhase = ''
ruby ./drake install
'';
meta = {
description = "Cross-platform tools for Matroska";
homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
};
}

1
pkgs/build-support/kernel/paths-from-graph.pl
View File

@ -53,6 +53,7 @@ elsif ($ENV{"printRegistration"} eq "1") {
foreach my $storePath (sort (keys %storePaths)) { foreach my $storePath (sort (keys %storePaths)) {
print "$storePath\n"; print "$storePath\n";
print "0000000000000000000000000000000000000000000000000000000000000000\n"; # !!! fix print "0000000000000000000000000000000000000000000000000000000000000000\n"; # !!! fix
print "0\n"; # !!! fix
print "\n"; # don't care about preserving the deriver print "\n"; # don't care about preserving the deriver
print scalar(@{$refs{$storePath}}), "\n"; print scalar(@{$refs{$storePath}}), "\n";
foreach my $ref (@{$refs{$storePath}}) { foreach my $ref (@{$refs{$storePath}}) {

1
pkgs/build-support/release/debian-build.nix
View File

@ -47,6 +47,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
''; '';
sysInfoPhase = '' sysInfoPhase = ''
[ ! -f /etc/lsb-release ] || (source /etc/lsb-release; echo "OS release: $DISTRIB_DESCRIPTION")
echo "System/kernel: $(uname -a)" echo "System/kernel: $(uname -a)"
if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi
header "installed Debian packages" header "installed Debian packages"

68
pkgs/build-support/vm/default.nix
View File

@ -680,7 +680,7 @@ rec {
done done
chroot=$(type -tP chroot) chroot=$(type -tP chroot)
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
/usr/bin/dpkg --install --force-all $debs < /dev/null /usr/bin/dpkg --install --force-all $debs < /dev/null || true
done done
echo "running post-install script..." echo "running post-install script..."
@ -1105,7 +1105,7 @@ rec {
sha256 = "6e3e813857496f2af6cd7e6ada06b3398fa067a7992c5fd7e8bd8fa92e3548b7"; sha256 = "6e3e813857496f2af6cd7e6ada06b3398fa067a7992c5fd7e8bd8fa92e3548b7";
}; };
urlPrefix = mirror://ubuntu; urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diff" ]; packages = commonDebPackages ++ [ "diff" "mktemp" ];
}; };
ubuntu910x86_64 = { ubuntu910x86_64 = {
@ -1116,7 +1116,7 @@ rec {
sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40"; sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40";
}; };
urlPrefix = mirror://ubuntu; urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diff" ]; packages = commonDebPackages ++ [ "diff" "mktemp" ];
}; };
ubuntu1004i386 = { ubuntu1004i386 = {
@ -1127,7 +1127,7 @@ rec {
sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa"; sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa";
}; };
urlPrefix = mirror://ubuntu; urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ]; packages = commonDebPackages ++ [ "diffutils" "mktemp" ];
}; };
ubuntu1004x86_64 = { ubuntu1004x86_64 = {
@ -1138,6 +1138,28 @@ rec {
sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0"; sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0";
}; };
urlPrefix = mirror://ubuntu; urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" "mktemp" ];
};
ubuntu1010i386 = {
name = "ubuntu-10.04-maverick-i386";
fullName = "Ubuntu 10.04 Maverick (i386)";
packagesList = fetchurl {
url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2;
sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ];
};
ubuntu1010x86_64 = {
name = "ubuntu-10.04-maverick-amd64";
fullName = "Ubuntu 10.04 Maverick (amd64)";
packagesList = fetchurl {
url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2;
sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ]; packages = commonDebPackages ++ [ "diffutils" ];
}; };
@ -1164,22 +1186,44 @@ rec {
}; };
debian50i386 = { debian50i386 = {
name = "debian-5.0.5-lenny-i386"; name = "debian-5.0.8-lenny-i386";
fullName = "Debian 5.0.5 Lenny (i386)"; fullName = "Debian 5.0.8 Lenny (i386)";
packagesList = fetchurl { packagesList = fetchurl {
url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2; url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
sha256 = "1nzd0r44lnvw2bmshqpbhghs84fxbcr1jkg55d37v4d09gsdmln0"; sha256 = "0dcvd8ivn71dwln7mx5dbqj30v4cqmc61lj21ry05karkglb5scg";
}; };
urlPrefix = mirror://debian; urlPrefix = mirror://debian;
packages = commonDebianPackages; packages = commonDebianPackages;
}; };
debian50x86_64 = { debian50x86_64 = {
name = "debian-5.0.5-lenny-amd64"; name = "debian-5.0.8-lenny-amd64";
fullName = "Debian 5.0.5 Lenny (amd64)"; fullName = "Debian 5.0.8 Lenny (amd64)";
packagesList = fetchurl { packagesList = fetchurl {
url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2; url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
sha256 = "04hab4ybjilppr1hwnl4k50vr5y88w7zn6v22phfrsrxf23nrlv3"; sha256 = "1wrqjfcqfs7q5i7jnr8115zsjlhzxxm2x41agp546d3wpj68k938";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian60i386 = {
name = "debian-6.0-squeeze-i386";
fullName = "Debian 6.0 Squeeze (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
sha256 = "1c1faz7ig9jvx3a2d2crp6fx0gynh5s4xw1vv1mn14rzkx86l59i";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian60x86_64 = {
name = "debian-6.0-squeeze-amd64";
fullName = "Debian 6.0 Squeeze (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
sha256 = "1c1n16q0hrimrnmv6shrr0z82xjqfjhm17salry8xi984c5fprwd";
}; };
urlPrefix = mirror://debian; urlPrefix = mirror://debian;
packages = commonDebianPackages; packages = commonDebianPackages;
@ -1262,11 +1306,9 @@ rec {
# Needed because it provides /etc/login.defs, whose absence causes # Needed because it provides /etc/login.defs, whose absence causes
# the "passwd" post-installs script to fail. # the "passwd" post-installs script to fail.
"login" "login"
# For shutting up some messages during some post-install scripts:
"mktemp"
]; ];
commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" ]; commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ];
/* A set of functions that build the Linux distributions specified /* A set of functions that build the Linux distributions specified

1
pkgs/desktops/kde-4.5/default.nix
View File

@ -140,7 +140,6 @@ recurseIntoAttrs rec {
printer_applet = callPackage ./utils/printer-applet.nix { }; printer_applet = callPackage ./utils/printer-applet.nix { };
superkaramba = callPackage ./utils/superkaramba.nix { }; superkaramba = callPackage ./utils/superkaramba.nix { };
sweeper = callPackage ./utils/sweeper.nix { }; sweeper = callPackage ./utils/sweeper.nix { };
wacomtablet = callPackage ./utils/wacomtablet.nix { };
}; };
kdewebdev = combinePkgs "kdewebdev" { kdewebdev = combinePkgs "kdewebdev" {

5
pkgs/desktops/kde-4.6/admin/default.nix
View File

@ -18,9 +18,6 @@ kde.package {
meta = { meta = {
description = "KDE Administration Utilities"; description = "KDE Administration Utilities";
license = "GPL"; license = "GPL";
kde = { kde.module = "kdeadmin";
name = "kdeadmin";
version = "4.5.90";
};
}; };
} }

5
pkgs/desktops/kde-4.6/base-runtime/default.nix
View File

@ -19,9 +19,6 @@ kde.package {
description = "KDE runtime"; description = "KDE runtime";
longDescription = "Libraries and tools which supports running KDE desktop applications"; longDescription = "Libraries and tools which supports running KDE desktop applications";
license = "LGPL"; license = "LGPL";
kde = { kde.module = "kdebase-runtime";
name = "kdebase-runtime";
version = "4.5.90";
};
}; };
} }

5
pkgs/desktops/kde-4.6/base-workspace/default.nix
View File

@ -19,9 +19,6 @@ kde.package {
description = "KDE base platform-specific components"; description = "KDE base platform-specific components";
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
license = "GPL"; license = "GPL";
kde = { kde.module = "kdebase-workspace";
name = "kdebase-workspace";
version = "4.5.90";
};
}; };
} }

5
pkgs/desktops/kde-4.6/base/default.nix
View File

@ -11,9 +11,6 @@ kde.package {
description = "KDE Base components"; description = "KDE Base components";
longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole"; longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
license = "GPL"; license = "GPL";
kde = { kde.module = "kdebase";
name = "kdebase";
version = "4.5.90";
};
}; };
} }

5
pkgs/desktops/kde-4.6/bindings/default.nix
View File

@ -28,10 +28,7 @@ kde.package rec {
description = "KDE bindings"; description = "KDE bindings";
longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python"; longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
license = "LGPL"; license = "LGPL";
kde = { kde.module = "kdebindings";
name = "kdebindings";
version = "4.5.90";
};
}; };
} }

11
pkgs/desktops/kde-4.6/default.nix
View File

@ -2,14 +2,14 @@
let let
version = "4.5.90"; release = "4.6.0";
# Various packages (e.g. kdesdk) have been split up into many # Various packages (e.g. kdesdk) have been split up into many
# smaller packages. Some people may want to install the entire # smaller packages. Some people may want to install the entire
# package, so provide a wrapper package that recombines them. # package, so provide a wrapper package that recombines them.
combinePkgs = name: pkgs: combinePkgs = name: pkgs:
let pkgs' = stdenv.lib.attrValues pkgs; in let pkgs' = stdenv.lib.attrValues pkgs; in
runCommand "${name}-${version}" ({ passthru = pkgs // { inherit pkgs; }; }) runCommand "${name}-${release}" ({ passthru = pkgs // { inherit pkgs; }; })
'' ''
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo ${toString pkgs'} > $out/nix-support/propagated-user-env-packages echo ${toString pkgs'} > $out/nix-support/propagated-user-env-packages
@ -18,13 +18,14 @@ let
in in
rec { rec {
recurseForRelease = true;
inherit callPackage stdenv; inherit callPackage stdenv;
qt4 = qt47; qt4 = qt47;
phonon = null; phonon = null;
kde = callPackage ./kde-package { }; kde = callPackage ./kde-package { inherit release; };
### SUPPORT ### SUPPORT
akonadi = callPackage ./support/akonadi { }; akonadi = callPackage ./support/akonadi { };
@ -35,7 +36,7 @@ rec {
eigen = callPackage ./support/eigen { }; eigen = callPackage ./support/eigen { };
oxygen_icons = callPackage ./support/oxygen-icons { }; oxygen_icons = callPackage ./oxygen-icons { };
polkit_qt_1 = callPackage ./support/polkit-qt-1 { }; polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
@ -154,7 +155,7 @@ rec {
kdebindings = callPackage ./bindings { }; kdebindings = callPackage ./bindings { };
l10n = callPackage ./l10n { }; l10n = callPackage ./l10n { inherit release; };
# Make the split packages visible to `nix-env -q'. # Make the split packages visible to `nix-env -q'.
misc = recurseIntoAttrs misc = recurseIntoAttrs

5
pkgs/desktops/kde-4.6/edu/default.nix
View File

@ -27,9 +27,6 @@ kde.package {
meta = { meta = {
description = "KDE Educative software"; description = "KDE Educative software";
license = "GPL"; license = "GPL";
kde = { kde.module = "kdeedu";
name = "kdeedu";
version = "4.5.90";
};
}; };
} }

5
pkgs/desktops/kde-4.6/games/default.nix
View File

@ -14,9 +14,6 @@ kde.package {
meta = { meta = {
description = "KDE Games"; description = "KDE Games";
license = "GPL"; license = "GPL";
kde = { kde.module = "kdegames";
name = "kdegames";
version = "4.5.90";
};
}; };
} }

5
pkgs/desktops/kde-4.6/graphics/default.nix
View File

@ -15,9 +15,6 @@ kde.package {
Okular document reader. Okular document reader.
''; '';
license = "GPL"; license = "GPL";
kde = { kde.module = "kdegraphics";
name = "kdegraphics";
version = "4.5.90";
};
}; };
} }

34
pkgs/desktops/kde-4.6/kde-package/default.nix
View File

@ -1,39 +1,25 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, release }:
rec { rec {
defaultArgs = {name, stable ? null, version, inherit release;
module ? name, release ? version, ... }:
assert (name == module) -> (release == version); manifest = import (./manifest + "-${release}.nix");
defaultArgs = { module, name ? module, ... }:
( (
{ {
name = "${name}-${version}"; name = "${name}-${release}";
src = src = fetchurl {
let url = "mirror://kde/" + (if manifest.stable then "" else "un")
manifest = (import (./manifest + "-${release}.nix")); + "stable/${release}/src/${module}-${release}.tar.bz2";
_stable = if stable == null then manifest.stable else stable; sha256 = builtins.getAttr module manifest.packages;
stableString = if _stable then "stable" else "unstable";
in
fetchurl {
url = "mirror://kde/${stableString}/${release}/src/${module}-${release}.tar.bz2";
sha256 = stdenv.lib.maybeAttr
module
(throw "No module ${module} in release ${release}!")
manifest.packages;
}; };
meta = { meta = {
maintainers = with stdenv.lib.maintainers; [ sander urkud ]; maintainers = with stdenv.lib.maintainers; [ sander urkud ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
homepage = if name == module
then http://www.kde.org
else assert builtins.substring 0 3 module == "kde";
"http://"
+ builtins.substring 3
(builtins.sub (builtins.stringLength module) 3) module
+ ".kde.org/projects/${name}";
}; };
} // (if module == name then { } else { } // (if module == name then { } else {
cmakeFlags = '' cmakeFlags = ''

85
pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix Normal file
View File

@ -0,0 +1,85 @@
{
stable = true;
packages = builtins.listToAttrs [
{
name = "kdeaccessibility";
value = "06b1w7gnfga4nd0spx48s5cx5jfsc9mxzc5yncns0471ia98ww92";
}
{
name = "kdeadmin";
value = "0nl3smhlsa4f68qq6p1kjbai2v5lbji2v84k96jfqvpjbkygkq27";
}
{
name = "kdeartwork";
value = "1qy0qwl3p0k5myd2f2ky400r5wvaq8gbvgb7mq6093amq0fghxlx";
}
{
name = "kdebase";
value = "095k83i1wd3cpk1pyc451gc4fajjynfknf83jsb6vxqisvm2mjn2";
}
{
name = "kdebase-runtime";
value = "1vwjly7p28sbhkg1vvnm0l94l2kwcs64jfh9hxlrgfz2bqp48b87";
}
{
name = "kdebase-workspace";
value = "10jkv4si6v12m9gspb7yk6x34lanwrnwfdw68jr59wp1ibcpkzzl";
}
{
name = "kdebindings";
value = "1xggvgryadi93hn3223614z4qajvypllxjscixv5zc9mvyh9z3ng";
}
{
name = "kdeedu";
value = "1x3s0dz8kyd8x7parzks434ifr8mj3w3lwaw30np4khgva258r2n";
}
{
name = "kdegames";
value = "1p8d9sy9mafza428wkj5g8hnfl8d06wqf74pdd39yr1ilmw0w1rb";
}
{
name = "kdegraphics";
value = "0j28aa2bglhpi9ck6a7334q603k7lfmfsr47grab81ic9aw6x38n";
}
{
name = "kdelibs";
value = "1pfydrdi4zwyxpygfmvk2jnfjal747kpf1m2az4fhvv91kx4clpd";
}
{
name = "kdemultimedia";
value = "1dhi7m5f22pz7sdrcl9g8zwf0mqcxzcys8hgbxzjfwjkg6h8mz28";
}
{
name = "kdenetwork";
value = "0d37db21nz3kjrr1swqykdbzwq3x4kapy3b9pbjic38phfnxksrs";
}
{
name = "kdepimlibs";
value = "1377lhlkfadfsqylkjm8hs8csak2cr6lwgimv97wxmp3x8v3lddq";
}
{
name = "kdeplasma-addons";
value = "0p8vzvnf0alk9yfv2ynawfbb33h68yhgc3f2ibgm1sdyg4gqx615";
}
{
name = "kdesdk";
value = "12hm20pzxj1k42l52dvjl64xda2r2gnvzlmf9kx9c5ccc0p8ch9z";
}
{
name = "kdetoys";
value = "0qaxy74n9g0vd6vqqwj3avbi3zhxikxk5aghdy2ynininmwzvqd9";
}
{
name = "kdeutils";
value = "1nv2fk8i77vc4jz9cbg4hvw5azw7ncvs3ircj74xy3ndw5b3fhxa";
}
{
name = "kdewebdev";
value = "0yl21qixd2ch6jxxccy03qnwnrws4lhbzj5hiv9pkw8w6zm16503";
}
{
name = "oxygen-icons";
value = "0a56q2d6nz3nsh8l5cycjiw7dq6ffkgyg3gyqql5iszcp6hrif3b";
}
];
}

44
pkgs/desktops/kde-4.6/l10n/default.nix
View File

@ -1,26 +1,18 @@
{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4 }: { stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4, release }:
let let
overrides = { };
defaultRelease = "4.5.90"; inherit (stdenv.lib) attrByPath singleton;
releases = [ "4.5.90" ];
sanitizeString = replaceChars [ "@" "." ] [ "_" "_" ]; kdeL10nDerivation =
getOverride = name: attrByPath [name] {} overrides; { lang, saneName, sha256 }:
inherit (stdenv.lib) replaceChars attrByPath singleton; stdenv.mkDerivation rec {
name = "kde-l10n-${saneName}-${release}";
kdeL10nDerivation = {lang, sha256, release} :
let
name = "kde-l10n-${lang}-${release}";
saneName = "kde-l10n-${sanitizeString lang}-${release}";
in
stdenv.mkDerivation ({
name = saneName;
src = fetchurl { src = fetchurl {
url = "mirror://kde/unstable/${release}/src/kde-l10n/${name}.tar.bz2"; url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
name = "${saneName}.tar.bz2"; name = "${name}.tar.bz2";
inherit sha256; inherit sha256;
}; };
@ -31,19 +23,14 @@ let
license = "GPL"; license = "GPL";
inherit (kdelibs.meta) maintainers platforms homepage; inherit (kdelibs.meta) maintainers platforms homepage;
}; };
} };
// (getOverride lang) // (getOverride name)
);
kdeL10nRelease = release: kdeL10nRelease =
let
releaseStr = sanitizeString release;
in
builtins.listToAttrs ( builtins.listToAttrs (
map ({lang, sha256}: map ({lang, saneName, sha256}:
{ {
name = "${sanitizeString lang}"; name = saneName;
value = kdeL10nDerivation { inherit lang release sha256;}; value = kdeL10nDerivation { inherit lang saneName sha256; };
} }
) (import (./manifest + "-${release}.nix")) ) (import (./manifest + "-${release}.nix"))
); );
@ -52,7 +39,4 @@ in
{ {
inherit kdeL10nDerivation; inherit kdeL10nDerivation;
recurseForDerivations = true; recurseForDerivations = true;
} } // kdeL10nRelease
// builtins.listToAttrs (map (r : { name = sanitizeString r; value =
kdeL10nRelease r; }) releases)
// (kdeL10nRelease defaultRelease)

1
pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh
View File

@ -24,6 +24,7 @@ for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
echo "{" echo "{"
echo " lang = \"${lang}\";" echo " lang = \"${lang}\";"
echo " saneName = \"$(echo $lang | sed s^@^_^g)\";"
echo " sha256 = \"${hash}\";" echo " sha256 = \"${hash}\";"
echo "}" echo "}"
echo $hash >&2 echo $hash >&2

267
pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix Normal file
View File

@ -0,0 +1,267 @@
[
{
lang = "ar";
saneName = "ar";
sha256 = "1dadlmd3s3752hcssnpzagly18yx7bj3r9pkc5qcb8nn9h91a92x";
}
{
lang = "bg";
saneName = "bg";
sha256 = "1nhqxdllfsljfnpw6ii78nfbv4rqncha1jjz9x9mz59qw4671a6n";
}
{
lang = "ca";
saneName = "ca";
sha256 = "1siha5sihazjdp7r26isi2m1s6nhzg4f7z2qqghh64lj3pw4xbzc";
}
{
lang = "ca@valencia";
saneName = "ca_valencia";
sha256 = "1d977lm78s1jq49ss5k6a6ixz1wiaq03i6pdjpl09jyirmlkg7dw";
}
{
lang = "cs";
saneName = "cs";
sha256 = "193xk5xsqq81xqcwmpix4dcz4l3qbwnvk1bc6awapcr8g56cgxbx";
}
{
lang = "da";
saneName = "da";
sha256 = "1y3b36y6w3ca238bnyvfvbkvpadbyvch40p4g82fg16ifnqpxrc7";
}
{
lang = "de";
saneName = "de";
sha256 = "1h38dxq6ggrvmc6b2w825xk7sf1032m9psfpg04gzarq6qicskdw";
}
{
lang = "el";
saneName = "el";
sha256 = "0ngs7k9nd7vz54804jnbvm10d8iiajvkiz01g9pimkiwlid325d3";
}
{
lang = "en_GB";
saneName = "en_GB";
sha256 = "12fr4npqcrsnndlz8qvbca5v6r0da53phxa1mks8ka603gh76hg3";
}
{
lang = "es";
saneName = "es";
sha256 = "1mf034ha0n27f82cx20cfr1jsbiapz4zs8bwwhjbdbiizsxivanj";
}
{
lang = "et";
saneName = "et";
sha256 = "1x1b8kn8fnv6dvg6f2j6h8kg1g4z3j9zb16likiwb6rp7fy0a859";
}
{
lang = "eu";
saneName = "eu";
sha256 = "1y2gwi2x5qx04yfqhn21asgsc67kn895l4npi8nhzv2pa0w8mif6";
}
{
lang = "fi";
saneName = "fi";
sha256 = "0lfw1s7ryl5fmrj07390ldayxkfsrc3haxfi8987pg8vxwsicb7n";
}
{
lang = "fr";
saneName = "fr";
sha256 = "00i2ziid18c5hz468rv1mljzpyky84r03bmszy8hlakd2jmsbm9r";
}
{
lang = "ga";
saneName = "ga";
sha256 = "0qg200sqbnq00qpcmgw10xl6hyjk50m1zks5nly5lxpfxqkmpqzh";
}
{
lang = "gl";
saneName = "gl";
sha256 = "0mivdn6hq7icl41pkaim6rc4z3ilsiqlaj84s8q46f8dmh9hdvnv";
}
{
lang = "gu";
saneName = "gu";
sha256 = "1h2df76bqhnxmgwgbck69f58p616fra7jqwdi91n5zdga975y4ag";
}
{
lang = "he";
saneName = "he";
sha256 = "1gfq82666x3rvrd84qfy51638gbi6r081fxd19av52k00npkrgi5";
}
{
lang = "hi";
saneName = "hi";
sha256 = "1k8916yv4bs5h40dvh9p4vgpyk1ylyckliazkwaldqdhghzfkzp3";
}
{
lang = "hr";
saneName = "hr";
sha256 = "011pkb42m0arlkkcmlj2r353k7ybglhfsb2hjh5b3bg2sq8cmpcm";
}
{
lang = "hu";
saneName = "hu";
sha256 = "124x73ag3nhs9ghfn4lpw29zjyycbj9zxin2d5rb2zdj8r9p2dcw";
}
{
lang = "ia";
saneName = "ia";
sha256 = "1j592k8z7d08sngazjqv6fpym4863s0hg1swcvnmys5ighm69dvh";
}
{
lang = "id";
saneName = "id";
sha256 = "01h3ax0dqca05qn2vm9v12wd4iyhk2q69lwa6zic6maqnj47s50s";
}
{
lang = "is";
saneName = "is";
sha256 = "0qgwfr9k2zqqcxwh82bf0x58h9wd03l9j87hz4xpw2k3jc82fpbk";
}
{
lang = "it";
saneName = "it";
sha256 = "1rmqp0v018na4s60cq5j5nqpvz94fyvhklwb1zjhdlfd2lfwcjrc";
}
{
lang = "ja";
saneName = "ja";
sha256 = "1qhibkrm2qmra6ib1973dqwz43w1sd87ys8hnnnjn52fwshpcm5z";
}
{
lang = "kk";
saneName = "kk";
sha256 = "1si8kfsw0h1jr4grgy6b7q3gnlv6pxpr7rlgl3g9b2f62zc1xaxd";
}
{
lang = "km";
saneName = "km";
sha256 = "1gs09hxd66qxl5kwg1rd9xfqvy8l1s49lc09971rr9qw9kxy43ks";
}
{
lang = "kn";
saneName = "kn";
sha256 = "13jgfbac3b5zsjgfw7zqk5l7wxnhsnf1kpa5ski002jcxb354n7q";
}
{
lang = "ko";
saneName = "ko";
sha256 = "0k0jgf6w94fd21ah609axqdgwn8rmx3j09cn95i0g258f8mvibhg";
}
{
lang = "lt";
saneName = "lt";
sha256 = "0nh57snn8ar077k6fj9j2fza9wpwc7j8lvwzfab7i5gka7js9vj5";
}
{
lang = "lv";
saneName = "lv";
sha256 = "0a2w06gvgxzh312fqnagp7r8hcbry61mvy9d4lh3kvd13gkgzi9z";
}
{
lang = "mai";
saneName = "mai";
sha256 = "1l8y0ck50h4wmirk3vkmj5lbcv0h8pir1wlfs15mbsk93r89fyys";
}
{
lang = "nb";
saneName = "nb";
sha256 = "1qw29p7w4ik8wnipsmiyfgp3k438ndr8c4m3c4p2gwx6v06vfynx";
}
{
lang = "nds";
saneName = "nds";
sha256 = "1gp0bqmrzpi0fsp919sj057q8c4zzyi7hxanrns6kc4q42x17xd2";
}
{
lang = "nl";
saneName = "nl";
sha256 = "1k6694lxp0szkqdb68zsvpq15zlvi51zxz9samgd7z4ng99hvv12";
}
{
lang = "nn";
saneName = "nn";
sha256 = "19sp5zaccvlkfjh29dz7i9d6whxa3ap6ji0g3dxkfix76xjchlir";
}
{
lang = "pa";
saneName = "pa";
sha256 = "09x53m297jiqv1qclp532c6g0d9d9z5k7kdaivhi69vj2bikf63p";
}
{
lang = "pl";
saneName = "pl";
sha256 = "0ygajy6mmdkxidq72qhbacn8hfq8rjvc0frz0jrvv2s2ywawknpn";
}
{
lang = "pt";
saneName = "pt";
sha256 = "1333564qpzvdx6qv9hs6n4yssh3lakskdr69hmbjyvnmjdx07f1y";
}
{
lang = "pt_BR";
saneName = "pt_BR";
sha256 = "1p378b8nncr55vkk9sfry6zj1zhjrvswwsb5az9q1yk14wgc050a";
}
{
lang = "ro";
saneName = "ro";
sha256 = "15lpmdidf3as9pbw7qgryvwk26sjb9lw9v3bvxx34aq299ifb6hf";
}
{
lang = "ru";
saneName = "ru";
sha256 = "1n8zwhlkn9sf256jdp7fh9qazwvn95qmr789ndg1xr7xm87y87fw";
}
{
lang = "sk";
saneName = "sk";
sha256 = "1q3bg2kw5fghzjx6a9j0029f11w7hir67ll8pl8xi4dpw4fxdqy1";
}
{
lang = "sl";
saneName = "sl";
sha256 = "17xr2p3nwx3sswc3qq6qqh671h6i3rvvprhnv86axddj369dhaai";
}
{
lang = "sr";
saneName = "sr";
sha256 = "0kflgcbw17flk9qyk631qqkw74v7k9cyrdag3v15rpcrmvvyzxmk";
}
{
lang = "sv";
saneName = "sv";
sha256 = "056i52sv5zml6c9wciqbh3v6ghgvmwq8s5wzpqx7nwnl5m9cb2x8";
}
{
lang = "th";
saneName = "th";
sha256 = "0bk31gady68rp650a4d0w3zx0cz095sjqmg2j09pjsc0j29dfsf9";
}
{
lang = "tr";
saneName = "tr";
sha256 = "0y3vk3csx3z54lqncpcyr31ivldbn6wkhsgycghrzg7yb3n6w5pa";
}
{
lang = "uk";
saneName = "uk";
sha256 = "0jqsqakz2xniw9bh0dz7w1vslvkwgpibhny7yb01g604l1zz1znn";
}
{
lang = "wa";
saneName = "wa";
sha256 = "0jbmgh1sbfkqxim7wkn29kl5m22k105daz2ypih4f31vzdsqzn9h";
}
{
lang = "zh_CN";
saneName = "zh_CN";
sha256 = "1l4slrz0bhbhsarf4pcr86qph1ry1477y7w1956a22p8a4a4ywr3";
}
{
lang = "zh_TW";
saneName = "zh_TW";
sha256 = "11harkdwzl328b3m25l8fkc77g0mbpprgaw41bdq3pf0j6wjmd3m";
}
]

5
pkgs/desktops/kde-4.6/libs/default.nix
View File

@ -34,9 +34,6 @@ kde.package {
meta = { meta = {
description = "KDE libraries"; description = "KDE libraries";
license = "LGPL"; license = "LGPL";
kde = { kde.module = "kdelibs";
name = "kdelibs";
version = "4.5.90";
};
}; };
} }

5
pkgs/desktops/kde-4.6/multimedia/default.nix
View File

@ -12,9 +12,6 @@ kde.package {
Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer. Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
''; '';
license = "GPL"; license = "GPL";
kde = { kde.module = "kdemultimedia";
name = "kdemultimedia";
version = "4.5.90";
};
}; };
} }

5
pkgs/desktops/kde-4.6/network/default.nix
View File

@ -28,9 +28,6 @@ kde.package {
description = "KDE network utilities"; description = "KDE network utilities";
longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface"; longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
license = "GPL"; license = "GPL";
kde = { kde.module = "kdenetwork";
name = "kdenetwork";
version = "4.5.90";
};
}; };
} }

7
pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix → pkgs/desktops/kde-4.6/oxygen-icons/default.nix
View File

@ -3,16 +3,13 @@
kde.package { kde.package {
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "0yl5clp4dyxk6pg8lp3w3z44ayjhn7i47ww8n952mam5il6mlfl1"; outputHash = "1qqdmg4q145gac23b0kyarslfwnlkngcxm6x37b03vr1srccycmx";
buildInputs = [ cmake ]; buildInputs = [ cmake ];
meta = { meta = {
description = "KDE Oxygen theme icons"; description = "KDE Oxygen theme icons";
longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3"; longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
license = "GPL"; license = "GPL";
kde = { kde.module = "oxygen-icons";
name = "oxygen-icons";
version = "4.5.90";
};
}; };
} }

20
pkgs/desktops/kde-4.6/pim-runtime/default.nix
View File

@ -1,18 +1,16 @@
{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info { kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
, kdelibs, kdepimlibs , kdelibs, kdepimlibs, gettext
, automoc4, phonon, akonadi, soprano, strigi}: , automoc4, phonon, akonadi, soprano, strigi}:
kde.package rec { kde.package rec {
buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info name = with meta.kde; "${module}-${release}";
kdelibs kdepimlibs
automoc4 phonon akonadi soprano strigi ]; buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info kdelibs
prePatch = '' kdepimlibs automoc4 phonon akonadi soprano strigi gettext ];
find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
'';
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2"; url = "mirror://kde/unstable/kdepim/${meta.kde.release}/src/${name}.tar.bz2";
sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n"; sha256 = "0gsp1yycjb7a3p285yqhs6v9rsrpbq0wfq3jhz7ky306692lrxig";
}; };
meta = { meta = {
@ -20,8 +18,8 @@ kde.package rec {
homepage = http://www.kde.org; homepage = http://www.kde.org;
license = "GPL"; license = "GPL";
kde = { kde = {
name = "kdepim-runtime"; release = "4.5.94.1";
version = "4.4.8"; module = "kdepim-runtime";
}; };
}; };
} }

16
pkgs/desktops/kde-4.6/pim/default.nix
View File

@ -1,22 +1,20 @@
{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt { kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime , shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
, automoc4, akonadi, qca2}: , automoc4, akonadi, qca2, gettext, grantlee}:
kde.package rec { kde.package rec {
buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt
shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ]; shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi gettext
prePatch = '' grantlee ];
find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
'';
postInstall = '' postInstall = ''
mkdir -p $out/nix-support/ mkdir -p $out/nix-support/
echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
''; '';
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2"; url = "mirror://kde/unstable/kdepim/${meta.kde.release}/src/${meta.kde.module}-${meta.kde.release}.tar.bz2";
sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh"; sha256 = "1bnlyrflcjy7lj4c2jag212ws2gzzpqyn5g2p97x8y936dza7ic3";
}; };
meta = { meta = {
@ -27,8 +25,8 @@ kde.package rec {
license = "GPL"; license = "GPL";
homepage = http://pim.kde.org; homepage = http://pim.kde.org;
kde = { kde = {
name = "kdepim"; release = "4.5.94.1";
version = "4.4.8"; module = "kdepim";
}; };
}; };
} }

9
pkgs/desktops/kde-4.6/pimlibs/default.nix
View File

@ -1,18 +1,15 @@
{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info { kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
, kdelibs, automoc4, akonadi, soprano}: , kdelibs, automoc4, akonadi, soprano, libxslt}:
kde.package { kde.package {
buildInputs = [ cmake automoc4 perl shared_mime_info ]; buildInputs = [ cmake automoc4 perl shared_mime_info libxslt ];
propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs
akonadi soprano ]; akonadi soprano ];
meta = { meta = {
description = "KDE PIM libraries"; description = "KDE PIM libraries";
license = "LGPL"; license = "LGPL";
kde = { kde.module = "kdepimlibs";
name = "kdepimlibs";
version = "4.5.90";
};
}; };
} }

5
pkgs/desktops/kde-4.6/plasma-addons/default.nix
View File

@ -15,9 +15,6 @@ kde.package {
meta = { meta = {
description = "KDE Plasma Addons"; description = "KDE Plasma Addons";
license = "GPL"; license = "GPL";
kde = { kde.module = "kdeplasma-addons";
name = "kdeplasma-addons";
version = "4.5.90";
};
}; };
} }

4
pkgs/desktops/kde-4.6/support/akonadi/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}: {stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "akonadi-1.4.90"; name = "akonadi-1.5.0";
src = fetchurl { src = fetchurl {
url = "http://download.akonadi-project.org/${name}.tar.bz2"; url = "http://download.akonadi-project.org/${name}.tar.bz2";
sha256 = "0am4m81zhq343a42s1ig5jxx47i6g1d97r546qqzdm5w542r6c00"; sha256 = "1azk2g7vb2sampxlys1hkgf9jvzpv92afsjdl31ikqbckaqnbfqc";
}; };
buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

14
pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix
View File

@ -1,19 +1,19 @@
{ kde, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }: { stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
stdenv.mkDerivation rec {
name = "polkit-qt-1-0.99.0";
kde.package rec {
buildInputs = [ cmake qt4 automoc4 ]; buildInputs = [ cmake qt4 automoc4 ];
propagatedBuildInputs = [ polkit glib ]; propagatedBuildInputs = [ polkit glib ];
src = fetchurl { src = fetchurl {
url = with meta.kde; url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
"mirror://kde/stable/apps/KDE4.x/admin/${name}-${version}.tar.bz2";
sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r"; sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r";
}; };
patches = [ ./policy-files.patch ]; patches = [ ./policy-files.patch ];
meta.kde = { meta = {
name = "polkit-qt-1"; maintainers = with stdenv.lib.maintainers; [ urkud sander ];
version = "0.99.0";
}; };
} }

4
pkgs/desktops/kde-4.6/support/soprano/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}: {stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "soprano-2.5.63"; name = "soprano-2.6.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/soprano/${name}.tar.bz2"; url = "mirror://sourceforge/soprano/${name}.tar.bz2";
sha256 = "1i69pbfykgn2bp36hn1qk9sbw1yx4fnaa31bfxfdssfxli7ik6c4"; sha256 = "0dfdc4hcv25kwmv3wp13qjw2jg2fax4gcy79yia7sdgz5ik59xq2";
}; };
# We disable the Java backend, since we do not need them and they make the closure size much bigger # We disable the Java backend, since we do not need them and they make the closure size much bigger

55
pkgs/development/interpreters/guile/1.8.nix Normal file
View File

@ -0,0 +1,55 @@
{ fetchurl, stdenv, libtool, readline, gmp
, gawk, makeWrapper }:
stdenv.mkDerivation rec {
name = "guile-1.8.8";
src = fetchurl {
url = "mirror://gnu/guile/" + name + ".tar.gz";
sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3";
};
patches = [ ./cpp-4.5.patch ];
buildNativeInputs = [ makeWrapper gawk ];
propagatedBuildInputs = [ readline gmp libtool ];
selfBuildNativeInput = true;
postInstall = ''
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
'';
preBuild = ''
sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
'';
# Guile needs patching to preset results for the configure tests
# about pthreads, which work only in native builds.
preConfigure = ''
if test -n "$crossConfig"; then
configureFlags="--with-threads=no $configureFlags"
fi
'';
# One test fails.
# ERROR: file: "libtest-asmobs", message: "file not found"
# This is fixed here:
# <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
doCheck = false;
setupHook = ./setup-hook.sh;
meta = {
description = "GNU Guile, an embeddable Scheme interpreter";
longDescription = ''
GNU Guile is an interpreter for the Scheme programming language,
packaged as a library that can be embedded into programs to make
them extensible. It supports many SRFIs.
'';
homepage = http://www.gnu.org/software/guile/;
license = "LGPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

68
pkgs/development/interpreters/guile/1.9.nix
View File

@ -1,68 +0,0 @@
{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
, libffi, gawk, makeWrapper, coverageAnalysis ? null }:
# Do either a coverage analysis build or a standard build.
(if coverageAnalysis != null
then coverageAnalysis
else stdenv.mkDerivation)
rec {
name = "guile-1.9.15"; # This is a beta release!
src = fetchurl {
url = "ftp://alpha.gnu.org/gnu/guile/${name}.tar.gz";
sha256 = "0b6sd2a9s2ccdcr84d16ryk08sqqxgcw8bxisdz9z5b53dvpmh0p";
};
buildInputs =
[ makeWrapper gawk readline libtool libunistring
libffi pkgconfig
];
propagatedBuildInputs = [ gmp boehmgc ]
# XXX: These ones aren't normally needed here, but since
# `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
# the needed `-L' flags. As for why the `.la' file lacks the `-L' flags,
# see below.
++ [ libtool libunistring ];
patches =
stdenv.lib.optionals (coverageAnalysis != null)
[ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ];
postInstall = ''
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
# why `--with-libunistring-prefix' and similar options coming from
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
sed -i "$out/lib/pkgconfig/guile-2.0.pc" \
-e 's|-lunistring|-L${libunistring}/lib -lunistring|g ;
s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
s|-lltdl|-L${libtool}/lib -lltdl|g'
'';
doCheck = true;
setupHook = ./setup-hook.sh;
meta = {
description = "GNU Guile 1.9 (beta), an embeddable Scheme implementation";
longDescription = ''
GNU Guile is an implementation of the Scheme programming language, with
support for many SRFIs, packaged for use in a wide variety of
environments. In addition to implementing the R5RS Scheme standard,
Guile includes a module system, full access to POSIX system calls,
networking support, multiple threads, dynamic linking, a foreign
function call interface, and powerful string processing.
'';
homepage = http://www.gnu.org/software/guile/;
license = "LGPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
};
}

78
pkgs/development/interpreters/guile/default.nix
View File

@ -1,55 +1,69 @@
{ fetchurl, stdenv, libtool, readline, gmp { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
, gawk, makeWrapper }: , libffi, gawk, makeWrapper, coverageAnalysis ? null }:
stdenv.mkDerivation rec { # Do either a coverage analysis build or a standard build.
name = "guile-1.8.8"; (if coverageAnalysis != null
then coverageAnalysis
else stdenv.mkDerivation)
rec {
name = "guile-2.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/guile/" + name + ".tar.gz"; url = "mirror://gnu/guile/${name}.tar.gz";
sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3"; sha256 = "0yy6iqlgqaav0nszldlkv8dq4xhcs6r18ahp4h2885jv9payp93v";
}; };
patches = [ ./cpp-4.5.patch ]; buildInputs =
[ makeWrapper gawk readline libtool libunistring
libffi pkgconfig
];
propagatedBuildInputs = [ gmp boehmgc ]
buildNativeInputs = [ makeWrapper gawk ]; # XXX: These ones aren't normally needed here, but since
propagatedBuildInputs = [ readline gmp libtool ]; # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
selfBuildNativeInput = true; # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags,
# see below.
++ [ libtool libunistring ];
patches =
stdenv.lib.optionals (coverageAnalysis != null)
[ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
# why `--with-libunistring-prefix' and similar options coming from
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
sed -i "$out/lib/pkgconfig/guile-2.0.pc" \
-e 's|-lunistring|-L${libunistring}/lib -lunistring|g ;
s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
s|-lltdl|-L${libtool}/lib -lltdl|g'
''; '';
preBuild = '' doCheck = true;
sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
'';
# Guile needs patching to preset results for the configure tests
# about pthreads, which work only in native builds.
preConfigure = ''
if test -n "$crossConfig"; then
configureFlags="--with-threads=no $configureFlags"
fi
'';
# One test fails.
# ERROR: file: "libtest-asmobs", message: "file not found"
# This is fixed here:
# <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
doCheck = false;
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
meta = { meta = {
description = "GNU Guile, an embeddable Scheme interpreter"; description = "GNU Guile 2.0, an embeddable Scheme implementation";
longDescription = '' longDescription = ''
GNU Guile is an interpreter for the Scheme programming language, GNU Guile is an implementation of the Scheme programming language, with
packaged as a library that can be embedded into programs to make support for many SRFIs, packaged for use in a wide variety of
them extensible. It supports many SRFIs. environments. In addition to implementing the R5RS Scheme standard
and a large subset of R6RS, Guile includes a module system, full access
to POSIX system calls, networking support, multiple threads, dynamic
linking, a foreign function call interface, and powerful string
processing.
''; '';
homepage = http://www.gnu.org/software/guile/; homepage = http://www.gnu.org/software/guile/;
license = "LGPLv2+"; license = "LGPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
}; };
} }

14
pkgs/development/interpreters/maude/default.nix
View File

@ -1,25 +1,23 @@
{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }: { stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "maude-2.5"; name = "maude-2.6";
src = fetchurl { src = fetchurl {
url = "http://maude.cs.uiuc.edu/download/current/Maude-2.5.tar.gz"; url = "http://maude.cs.uiuc.edu/download/current/Maude-2.6.tar.gz";
sha256 = "16bvnbyi257z87crzkw9gx2kz13482hnjnik22c2p2ml4rj4lpfw"; sha256 = "182abzhvjvlaa21aqv7802v3bs57a4dm7cw09s3mqmih7nzpkfm5";
}; };
fullMaude = fetchurl { fullMaude = fetchurl {
url = "http://maude.cs.uiuc.edu/download/current/FM2.5/full-maude25.maude"; url = "http://maude.cs.uiuc.edu/download/current/FM2.6/full-maude26.maude";
sha256 = "1d0izdbmhpifb2plnkk3cp7li2z60r8a8ppxhifmfpzi6x6pfvrd"; sha256 = "1382hjwwrsdgd5yjn3ph1b5i1bhrhzvqx0v369bmcjkly9k96v6q";
}; };
buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper]; buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper];
configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"''; configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"'';
# The test suite is known to fail on Darwin. If maude is ever updated to a doCheck = true;
# new version, this exception ought to be removed again.
doCheck = !stdenv.isDarwin;
postInstall = postInstall =
'' ''

47
pkgs/development/interpreters/racket/default.nix
View File

@ -1,34 +1,35 @@
{ stdenv, fetchurl, cairo, file, libjpeg { stdenv, fetchurl, cairo, file, pango, glib, gtk
, libpng, libtool, libXaw, libXext, libXft, libXrender , which, libtool, makeWrapper, libjpeg, libpng
, libXt, libXmu, mesa, pkgconfig, which } : , fontconfig, liberation_ttf } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "racket"; pname = "racket";
version = "5.0.2"; version = "5.1";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz"; url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
sha256 = "1xx0gc935mvh9b1nch7p4xscx9hjd0401rl1sdpf291nj9vmpb3k"; sha256 = "0k53jdsz0qf8jvydw29gnz1z8d9vs9ycfgilgqa6rcyp8i0f468k";
}; };
buildInputs = [ cairo # Various racket executables do run-time searches for these.
file ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib";
libjpeg
libpng buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf ];
libtool
libXaw
libXext
libXft
libXrender
libXt
libXmu
mesa
pkgconfig
which
];
preConfigure = '' preConfigure = ''
export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH
# Chroot builds do not have access to /etc/fonts/fonts.conf, but the Racket bootstrap
# needs a working fontconfig, so here a simple standin is used.
mkdir chroot-fontconfig
cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf
sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf
echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf
echo "</fontconfig>" >> chroot-fontconfig/fonts.conf
export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf
cd src cd src
sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure
sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure
@ -36,6 +37,12 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]; configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}" ;
done
'';
meta = { meta = {
description = "Racket (formerly called PLT Scheme) is a programming language derived from Scheme."; description = "Racket (formerly called PLT Scheme) is a programming language derived from Scheme.";
longDescription = '' longDescription = ''

5
pkgs/development/libraries/avahi/default.nix
View File

@ -1,6 +1,7 @@
{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
, expat, gettext, intltool, glib, gtk, qt4 ? null, lib , expat, gettext, intltool, glib, gtk, qt4 ? null, lib
, qt4Support ? false }: , qt4Support ? false
, withLibdnsCompat ? false }:
assert qt4Support -> qt4 != null; assert qt4Support -> qt4 != null;
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
"--${if qt4Support then "enable" else "disable"}-qt4" "--${if qt4Support then "enable" else "disable"}-qt4"
"--disable-python" "--disable-python"
"--with-distro=none" "--localstatedir=/var" "--with-distro=none" "--localstatedir=/var"
]; ] ++ stdenv.lib.optional withLibdnsCompat "--enable-compat-libdns_sd";
meta = { meta = {
description = "Avahi, an mDNS/DNS-SD implementation"; description = "Avahi, an mDNS/DNS-SD implementation";

11
pkgs/development/libraries/haskell/HaXml/1.13.3.nix Normal file
View File

@ -0,0 +1,11 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "HaXml";
version = "1.13.3";
sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0";
meta = {
description = "Haskell utilities for parsing, filtering, transforming and generating XML documents.";
};
})

7
pkgs/development/libraries/haskell/HaXml/default.nix
View File

@ -1,9 +1,10 @@
{cabal}: {cabal, polyparse}:
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "HaXml"; pname = "HaXml";
version = "1.13.3"; version = "1.20.2";
sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0"; sha256 = "05kmr2ablinnrg3x1xr19g5kzzby322lblvcvhwbkv26ajwi0b63";
propagatedBuildInputs = [polyparse];
meta = { meta = {
description = "Haskell utilities for parsing, filtering, transforming and generating XML documents."; description = "Haskell utilities for parsing, filtering, transforming and generating XML documents.";
}; };

4
pkgs/development/libraries/haskell/json/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "json"; pname = "json";
version = "0.4.3"; version = "0.4.4";
sha256 = "56192d1e922cc71ad1aaf31baea8ee7e1f1b862f95bc72f60548caee4a484a87"; sha256 = "102qmz55b2mgcca3q1c2pkcr6hz7kmpldad3f6blhmp1cz15f081";
propagatedBuildInputs = [mtl]; propagatedBuildInputs = [mtl];
meta = { meta = {
description = "Support for serialising Haskell to and from JSON"; description = "Support for serialising Haskell to and from JSON";

4
pkgs/development/libraries/libdbusmenu-qt/default.nix
View File

@ -2,14 +2,14 @@
let let
baseName = "libdbusmenu-qt"; baseName = "libdbusmenu-qt";
v = "0.5.1"; v = "0.7.0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${baseName}-${v}"; name = "${baseName}-${v}";
src = fetchurl { src = fetchurl {
url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2"; url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
sha256 = "0ipz1f08d2wgg18l12wssv9lhm66xhj31a1dbikg2rzw7c6bvjvk"; sha256 = "0zn3w57xjk34j08fx4n757kakkd4y07halrnaj4a0x0c9dhyjf14";
}; };
buildInputs = [ cmake qt4 ]; buildInputs = [ cmake qt4 ];

19
pkgs/development/libraries/libebml/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libebml-1.0.0";
src = fetchurl {
url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2";
sha256 = "0y5ip30nr96wjlh1pzw35ia1axyib158dhz8r5dxzmbcfgn0sj3j";
};
configurePhase = "cd make/linux";
makeFlags = "prefix=$(out)";
meta = {
description = "Extensible Binary Meta Language library";
homepage = http://dl.matroska.org/downloads/libebml/;
};
}

20
pkgs/development/libraries/libmatroska/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, libebml }:
stdenv.mkDerivation rec {
name = "libmatroska-1.0.0";
src = fetchurl {
url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2";
sha256 = "123v2dhvv6yijqxc30spabzznjf5lbcv4iv4mmz4b3jhvwiha06w";
};
configurePhase = "cd make/linux";
makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib";
propagatedBuildInputs = [ libebml ];
meta = {
description = "Matroska library";
homepage = http://dl.matroska.org/downloads/libmatroska;
};
}

8
pkgs/development/libraries/xapian/bindings/default.nix
View File

@ -3,13 +3,13 @@
let inherit (composableDerivation) wwf; in let inherit (composableDerivation) wwf; in
composableDerivation.composableDerivation {} { composableDerivation.composableDerivation {} rec {
name = "xapian-bindings-1.0.14"; name = "xapian-bindings-1.0.23";
src = fetchurl { src = fetchurl {
url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz; url = "http://oligarchy.co.uk/xapian/1.0.23/${name}.tar.gz";
sha256 = "060jjwddv6ws8iy3jkpl4zcrzzinkjvdblkl0gcja90qzl2j81q5"; sha256 = "6028123c3cd9bfc380b672b89f5420f7d5c063fc3511dee4dd5d34033ccb6911";
}; };
buildInputs = [ xapian pkgconfig ]; buildInputs = [ xapian pkgconfig ];

6
pkgs/development/libraries/xapian/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib }: { stdenv, fetchurl, zlib }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xapian-1.0.14"; name = "xapian-1.0.23";
src = fetchurl { src = fetchurl {
url = http://oligarchy.co.uk/xapian/1.0.14/xapian-core-1.0.14.tar.gz; url = http://oligarchy.co.uk/xapian/1.0.23/xapian-core-1.0.23.tar.gz;
sha256 = "0d51p6210059dbf0vn6zh2iyg4i5pynmhyh0gphnph2b317a1dcx"; sha256 = "0aed7296bd56b4b49aba944cc744e1e76fff8cfb0a70fd5b1f49d4c62a97ecc6";
}; };
buildInputs = [zlib]; buildInputs = [zlib];

1
pkgs/lib/maintainers.nix
View File

@ -8,6 +8,7 @@
andres = "Andres Loeh <andres@cs.uu.nl>"; andres = "Andres Loeh <andres@cs.uu.nl>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
bjg = "Brian Gough <bjg@gnu.org>"; bjg = "Brian Gough <bjg@gnu.org>";
chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>"; eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>";
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
guibert = "David Guibert <david.guibert@gmail.com>"; guibert = "David Guibert <david.guibert@gmail.com>";

16
pkgs/tools/networking/aircrack-ng/default.nix
View File

@ -1,11 +1,15 @@
{stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools}: {stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}:
stdenv.mkDerivation { let
name = "aircrack-ng-1.0-rc2"; rev = "1859";
in
stdenv.mkDerivation rec {
name = "aircrack-ng-1.1-${rev}";
src = fetchurl { src = fetchsvn {
url = http://download.aircrack-ng.org/aircrack-ng-1.0-rc2.tar.gz; url = "http://trac.aircrack-ng.org/svn/trunk";
sha256 = "9d52f15f3fca52775ecb9cfc1f0aeb04c3c3bd3101665d5760d395f7d2a87d8b"; inherit rev;
sha256 = "6ca98321ef3f14af9c78b2fe25091c4e79e3c28679f240b80f8aeda71b84ab4a";
}; };
buildInputs = [libpcap openssl zlib]; buildInputs = [libpcap openssl zlib];

10
pkgs/tools/networking/lftp/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, readline}: {stdenv, fetchurl, gnutls, libtasn1, pkgconfig, readline, zlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lftp-3.5.14"; name = "lftp-4.1.3";
src = fetchurl { src = fetchurl {
url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-3.5.14.tar.bz2; url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-4.1.3.tar.bz2;
sha256 = "0hzrbhpgvndpd4wd08whfv1iqzbcijs1nxz40rhn651xabhiasrv"; sha256 = "1nbgbql8kkhdvai0glwgkq8l9ik09l5lb8znpjrv26hfzl15dvv1";
}; };
buildInputs = [readline]; buildInputs = [gnutls libtasn1 pkgconfig readline zlib];
} }

50
pkgs/top-level/all-packages.nix
View File

@ -388,7 +388,9 @@ let
at = callPackage ../tools/system/at { }; at = callPackage ../tools/system/at { };
autogen = callPackage ../development/tools/misc/autogen { }; autogen = callPackage ../development/tools/misc/autogen {
guile = guile_1_8;
};
autojump = callPackage ../tools/misc/autojump { }; autojump = callPackage ../tools/misc/autojump { };
@ -866,7 +868,9 @@ let
lzop = callPackage ../tools/compression/lzop { }; lzop = callPackage ../tools/compression/lzop { };
mailutils = callPackage ../tools/networking/mailutils { }; mailutils = callPackage ../tools/networking/mailutils {
guile = guile_1_8;
};
man = callPackage ../tools/misc/man { }; man = callPackage ../tools/misc/man { };
@ -878,7 +882,9 @@ let
mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };
mcron = callPackage ../tools/system/mcron { }; mcron = callPackage ../tools/system/mcron {
guile = guile_1_8;
};
mdbtools = callPackage ../tools/misc/mdbtools { }; mdbtools = callPackage ../tools/misc/mdbtools { };
@ -1288,6 +1294,7 @@ let
texmacs = callPackage ../applications/editors/texmacs { texmacs = callPackage ../applications/editors/texmacs {
tex = texLive; /* tetex is also an option */ tex = texLive; /* tetex is also an option */
extraFonts = true; extraFonts = true;
guile = guile_1_8;
}; };
tmux = callPackage ../tools/misc/tmux { }; tmux = callPackage ../tools/misc/tmux { };
@ -2234,9 +2241,11 @@ let
groovy = callPackage ../development/interpreters/groovy { }; groovy = callPackage ../development/interpreters/groovy { };
guile = callPackage ../development/interpreters/guile { }; guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
guile_1_9 = callPackage ../development/interpreters/guile/1.9.nix { }; guile_2_0 = callPackage ../development/interpreters/guile { };
guile = guile_2_0;
io = builderDefsPackage (import ../development/interpreters/io) { io = builderDefsPackage (import ../development/interpreters/io) {
inherit sqlite zlib gmp libffi cairo ncurses freetype mesa inherit sqlite zlib gmp libffi cairo ncurses freetype mesa
@ -2353,7 +2362,10 @@ let
qi = callPackage ../development/compilers/qi { }; qi = callPackage ../development/compilers/qi { };
racket = callPackage ../development/interpreters/racket { }; racket = callPackage ../development/interpreters/racket {
inherit (gtkLibs) pango glib gtk;
libjpeg = libjpeg62;
};
ruby18 = callPackage ../development/interpreters/ruby { }; ruby18 = callPackage ../development/interpreters/ruby { };
#ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit ruby18 fetchurl; }; #ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit ruby18 fetchurl; };
@ -3446,6 +3458,8 @@ let
libdvdread = callPackage ../development/libraries/libdvdread { }; libdvdread = callPackage ../development/libraries/libdvdread { };
libebml = callPackage ../development/libraries/libebml { };
libedit = callPackage ../development/libraries/libedit { }; libedit = callPackage ../development/libraries/libedit { };
libelf = callPackage ../development/libraries/libelf { }; libelf = callPackage ../development/libraries/libelf { };
@ -3568,6 +3582,8 @@ let
libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { }; libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { };
libmatroska = callPackage ../development/libraries/libmatroska { };
libmcs = callPackage ../development/libraries/libmcs { }; libmcs = callPackage ../development/libraries/libmcs { };
libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
@ -3793,6 +3809,8 @@ let
ming = callPackage ../development/libraries/ming { }; ming = callPackage ../development/libraries/ming { };
mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
mlt = callPackage ../development/libraries/mlt { mlt = callPackage ../development/libraries/mlt {
qt = qt4; qt = qt4;
}; };
@ -5285,6 +5303,7 @@ let
trackballs = callPackage ../games/trackballs { trackballs = callPackage ../games/trackballs {
debug = false; debug = false;
guile = guile_1_8;
}; };
tunctl = callPackage ../os-specific/linux/tunctl { }; tunctl = callPackage ../os-specific/linux/tunctl { };
@ -5591,6 +5610,7 @@ let
beast = callPackage ../applications/audio/beast { beast = callPackage ../applications/audio/beast {
inherit (gnome) libgnomecanvas libart_lgpl; inherit (gnome) libgnomecanvas libart_lgpl;
guile = guile_1_8;
}; };
bibletime = newScope pkgs.kde45 ../applications/misc/bibletime { bibletime = newScope pkgs.kde45 ../applications/misc/bibletime {
@ -5999,6 +6019,7 @@ let
inherit (gnome) gtk glib libglade libgnomeui libgtkhtml gtkhtml inherit (gnome) gtk glib libglade libgnomeui libgtkhtml gtkhtml
libgnomeprint; libgnomeprint;
gconf = gnome.GConf; gconf = gnome.GConf;
guile = guile_1_8;
}; };
qcad = callPackage ../applications/misc/qcad { }; qcad = callPackage ../applications/misc/qcad { };
@ -6176,6 +6197,8 @@ let
kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
kde_wacomtablet = newScope pkgs.kde4 ../applications/misc/kde-wacomtablet { };
kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { }; kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { };
kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { }; kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { };
@ -6358,8 +6381,7 @@ let
mumble = callPackage ../applications/networking/mumble { mumble = callPackage ../applications/networking/mumble {
avahi = avahi.override { avahi = avahi.override {
qt4Support = true; withLibdnsCompat = true;
inherit qt4;
}; };
}; };
@ -6388,6 +6410,8 @@ let
netsurfBrowser = netsurf.browser; netsurfBrowser = netsurf.browser;
netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; }); netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; });
notmuch = callPackage ../applications/networking/mailreaders/notmuch { };
nvi = callPackage ../applications/editors/nvi { }; nvi = callPackage ../applications/editors/nvi { };
ocrad = callPackage ../applications/graphics/ocrad { }; ocrad = callPackage ../applications/graphics/ocrad { };
@ -6554,7 +6578,8 @@ let
}; };
snd = sndBase.passthru.function { snd = sndBase.passthru.function {
inherit guile mesa libtool jackaudio alsaLib; inherit mesa libtool jackaudio alsaLib;
guile = guile_1_8;
}; };
sonicVisualizer = callPackage ../applications/audio/sonic-visualizer { sonicVisualizer = callPackage ../applications/audio/sonic-visualizer {
@ -6891,7 +6916,9 @@ let
atanks = callPackage ../games/atanks {}; atanks = callPackage ../games/atanks {};
ballAndPaddle = callPackage ../games/ball-and-paddle { }; ballAndPaddle = callPackage ../games/ball-and-paddle {
guile = guile_1_8;
};
blackshades = callPackage ../games/blackshades { }; blackshades = callPackage ../games/blackshades { };
@ -7189,7 +7216,8 @@ let
drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) { drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
inherit (gnome) libglade gtk; inherit (gnome) libglade gtk;
inherit libxml2 guile perl intltool libtool pkgconfig; inherit libxml2 perl intltool libtool pkgconfig;
guile = guile_1_8;
}; };
tetgen = callPackage ../applications/science/geometry/tetgen { }; tetgen = callPackage ../applications/science/geometry/tetgen { };

13
pkgs/top-level/haskell-packages.nix
View File

@ -252,13 +252,15 @@ rec {
HAppSState = callPackage ../development/libraries/haskell/HAppS/HAppS-State.nix {}; HAppSState = callPackage ../development/libraries/haskell/HAppS/HAppS-State.nix {};
/* cannot yet get this to work with 6.12.1 */ happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {
happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {}; HaXml = HaXml_1_13_3;
};
happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {}; happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {};
happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix { happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {
network = network_2_2_1_7; network = network_2_2_1_7;
HaXml = HaXml_1_13_3;
}; };
hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
@ -349,12 +351,17 @@ rec {
HTTP_3001 = callPackage ../development/libraries/haskell/HTTP/3001.nix {}; HTTP_3001 = callPackage ../development/libraries/haskell/HTTP/3001.nix {};
haxr = callPackage ../development/libraries/haskell/haxr {}; haxr = callPackage ../development/libraries/haskell/haxr {
HTTP = HTTP_4000_0_9;
HaXml = HaXml_1_13_3;
};
haxr_th = callPackage ../development/libraries/haskell/haxr-th {}; haxr_th = callPackage ../development/libraries/haskell/haxr-th {};
HaXml = callPackage ../development/libraries/haskell/HaXml {}; HaXml = callPackage ../development/libraries/haskell/HaXml {};
HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix {};
HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {}; HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};
HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix { HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix {

74
pkgs/top-level/python-packages.nix
View File

@ -699,6 +699,34 @@ rec {
}; };
}); });
pymacs = pkgs.stdenv.mkDerivation rec {
version = "v0.24-beta2";
name = "Pymacs-${version}";
src = fetchurl {
url = "https://github.com/pinard/Pymacs/tarball/${version}";
name = "${name}.tar.gz";
sha256 = "0nzb3wrxwy0cmmj087pszkwgj2v22x0y5m4vxb6axz94zfl02r8j";
};
buildInputs = [ python ];
configurePhase = ''
python p4 -C p4config.py *.in Pymacs contrib tests
'';
installPhase = ''
python setup.py install --prefix=$out
'';
meta = with stdenv.lib; {
description = "Emacs Lisp to Python interface";
homepage = http://pymacs.progiciels-bpi.ca;
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
};
};
pyopengl = pyopengl =
let version = "3.0.0b5"; let version = "3.0.0b5";
in in
@ -853,6 +881,52 @@ rec {
}; };
}); });
rope = pkgs.stdenv.mkDerivation rec {
version = "0.9.3";
name = "rope-${version}";
src = fetchurl {
url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz";
sha256 = "1092rlsfna7rm1jkdanilsmw7rr3hlkgyji02xfd02wfcm8xa2i7";
};
buildInputs = [ python ];
installPhase = ''
python setup.py install --prefix=$out
'';
meta = with stdenv.lib; {
description = "python refactoring library";
homepage = http://rope.sf.net;
maintainers = [ maintainers.goibhniu ];
license = licenses.gpl2;
};
};
ropemacs = pkgs.stdenv.mkDerivation rec {
version = "0.6";
name = "ropemacs-${version}";
src = fetchurl {
url = "mirror://sourceforge/rope/${name}.tar.gz";
sha256 = "1afqybmjn7fqkwx8y8kx1kfx181ix73cbq3a0d5n7ryjm7k1r0s4";
};
buildInputs = [ python ];
installPhase = ''
python setup.py install --prefix=$out
'';
meta = with stdenv.lib; {
description = "a plugin for performing python refactorings in emacs";
homepage = http://rope.sf.net/ropemacs.html;
maintainers = [ maintainers.goibhniu ];
license = licenses.gpl2;
};
};
pysvn = pkgs.stdenv.mkDerivation { pysvn = pkgs.stdenv.mkDerivation {
name = "pysvn-1.7.2"; name = "pysvn-1.7.2";

19
pkgs/top-level/release-cross.nix
View File

@ -154,6 +154,13 @@ let
}; };
in { in {
crossMingw32 = mapTestOnCross crossSystem { crossMingw32 = mapTestOnCross crossSystem {
coreutils.hostDrv = nativePlatforms;
boehmgc.hostDrv = nativePlatforms;
gmp.hostDrv = nativePlatforms;
guile_1_8.hostDrv = nativePlatforms;
libffi.hostDrv = nativePlatforms;
libtool.hostDrv = nativePlatforms;
libunistring.hostDrv = nativePlatforms;
windows.wxMSW.hostDrv = nativePlatforms; windows.wxMSW.hostDrv = nativePlatforms;
}; };
}) // ( }) // (
@ -175,10 +182,16 @@ in {
hurdCross = nativePlatforms; hurdCross = nativePlatforms;
mach.hostDrv = nativePlatforms; mach.hostDrv = nativePlatforms;
coreutils_real.hostDrv = nativePlatforms; coreutils.hostDrv = nativePlatforms;
ed.hostDrv = nativePlatforms; ed.hostDrv = nativePlatforms;
grub2.hostDrv = nativePlatforms; grub2.hostDrv = nativePlatforms;
inetutils.hostDrv = nativePlatforms; inetutils.hostDrv = nativePlatforms;
boehmgc.hostDrv = nativePlatforms;
gmp.hostDrv = nativePlatforms;
guile_1_8.hostDrv = nativePlatforms;
libffi.hostDrv = nativePlatforms;
libtool.hostDrv = nativePlatforms;
libunistring.hostDrv = nativePlatforms;
nixUnstable.hostDrv = nativePlatforms; nixUnstable.hostDrv = nativePlatforms;
patch.hostDrv = nativePlatforms; patch.hostDrv = nativePlatforms;
zile.hostDrv = nativePlatforms; zile.hostDrv = nativePlatforms;
@ -213,7 +226,7 @@ let
in { in {
fuloongminipc = mapTestOnCross crossSystem { fuloongminipc = mapTestOnCross crossSystem {
coreutils_real.hostDrv = nativePlatforms; coreutils.hostDrv = nativePlatforms;
ed.hostDrv = nativePlatforms; ed.hostDrv = nativePlatforms;
grub2.hostDrv = nativePlatforms; grub2.hostDrv = nativePlatforms;
inetutils.hostDrv = nativePlatforms; inetutils.hostDrv = nativePlatforms;
@ -273,7 +286,7 @@ let
in { in {
nanonote = mapTestOnCross crossSystem { nanonote = mapTestOnCross crossSystem {
coreutils_real.hostDrv = nativePlatforms; coreutils.hostDrv = nativePlatforms;
ed.hostDrv = nativePlatforms; ed.hostDrv = nativePlatforms;
inetutils.hostDrv = nativePlatforms; inetutils.hostDrv = nativePlatforms;
nixUnstable.hostDrv = nativePlatforms; nixUnstable.hostDrv = nativePlatforms;