Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
This commit is contained in:
Lluís Batlle i Rossell
commit
b48b2a7bb4
5
maintainers/scripts/nix-call-package
Executable file
5
maintainers/scripts/nix-call-package
Executable file
@ -0,0 +1,5 @@
|
||||
#! /bin/sh
|
||||
|
||||
echo "let pkgs = import /etc/nixos/nixpkgs$2 {}; x = pkgs.callPackage $1 { $3 }; in ${4:-x}" |
|
||||
nix-instantiate --show-trace - |
|
||||
xargs nix-store -r -K
|
||||
@ -4,7 +4,11 @@ stdenv.mkDerivation rec {
|
||||
name = "nvi-1.79";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.cpan.org/src/misc/nvi-1.79.tar.gz;
|
||||
urls =
|
||||
[ "ftp://ftp.eenet.ee/pub/cpan/src/misc/nvi-1.79.tar.gz"
|
||||
"ftp://ftp.saintjoe.edu/pub/CPAN/src/misc/nvi-1.79.tar.gz"
|
||||
"ftp://ftp.free.fr/.mirrors1/ftp.netbsd.org/packages/distfiles/nvi-1.79.tar.gz"
|
||||
];
|
||||
sha256 = "0cvf56rbylz7ksny6g2256sjg8yrsxrmbpk82r64rhi53sm8fnvm";
|
||||
};
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
|
||||
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
|
||||
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
|
||||
, gsl, python, pyxml, lxml }:
|
||||
, gsl, python, pyxml, lxml, poppler }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "inkscape-0.48.0";
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
|
||||
libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
|
||||
makeWrapper intltool gsl
|
||||
makeWrapper intltool gsl poppler
|
||||
];
|
||||
|
||||
configureFlags = "--with-python";
|
||||
|
||||
25
pkgs/applications/misc/evopedia/default.nix
Normal file
25
pkgs/applications/misc/evopedia/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{stdenv, fetchgit, bzip2, qt4, libX11}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "evopedia-0.4.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://gitorious.org/evopedia/evopedia.git;
|
||||
rev = "v0.4.2" ;
|
||||
md5 = "a2f19ed6e4d936c28cee28d44387b682";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
qmake PREFIX=$out
|
||||
'';
|
||||
|
||||
buildInputs = [ bzip2 qt4 libX11 ];
|
||||
|
||||
meta = {
|
||||
description = "Offline Wikipedia Viewer";
|
||||
homepage = http://www.evopedia.info;
|
||||
license = "GPLv3+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "3.6.12";
|
||||
firefoxVersion = "3.6.13";
|
||||
|
||||
xulVersion = "1.9.2.12"; # this attribute is used by other packages
|
||||
xulVersion = "1.9.2.13"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha1 = "1cc3885687dd5ad21167d9d45f76eb1458f46bdd";
|
||||
sha1 = "1d1bc70d651bce4006687f5762638563c0494267";
|
||||
};
|
||||
|
||||
|
||||
@ -46,10 +46,6 @@ rec {
|
||||
inherit src;
|
||||
|
||||
patches = [
|
||||
# To be removed when the change gets upstream. I don't know if the patch
|
||||
# affects xulrunner or firefox.
|
||||
./symlinks-bug551152.patch
|
||||
|
||||
# Loongson2f related patches:
|
||||
./xulrunner-chromium-mips.patch
|
||||
./xulrunner-mips-n32.patch
|
||||
|
||||
@ -1,139 +0,0 @@
|
||||
The firefox people has not applied this patch along all the 3.6 releases so in 3.6.4 it is still not there.
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=551152
|
||||
https://bugzilla.mozilla.org/attachment.cgi?id=431403
|
||||
|
||||
diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
|
||||
index 57f6df9..e9909a7 100644
|
||||
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
|
||||
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
|
||||
@@ -633,10 +633,6 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile)
|
||||
aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile),
|
||||
getter_AddRefs(current));
|
||||
NS_ASSERTION(current, "broken search path! bad element");
|
||||
- // nsIFile::Equals basically compares path strings so normalize
|
||||
- // before the comparison.
|
||||
- parent->Normalize();
|
||||
- current->Normalize();
|
||||
PRBool same;
|
||||
if (NS_SUCCEEDED(parent->Equals(current, &same)) && same)
|
||||
return (int) i;
|
||||
diff --git a/xpcom/tests/unit/test_file_equality.js b/xpcom/tests/unit/test_file_equality.js
|
||||
index 4f424fe..14ba5a8 100644
|
||||
--- a/xpcom/tests/unit/test_file_equality.js
|
||||
+++ b/xpcom/tests/unit/test_file_equality.js
|
||||
@@ -63,7 +63,7 @@ function test_normalized_vs_non_normalized()
|
||||
|
||||
// this is a non-normalized version of tmp1, it should not equal tmp1
|
||||
tmp2.appendRelativePath(".");
|
||||
- do_check_false(tmp1.equals(tmp2));
|
||||
+ do_check_true(tmp1.equals(tmp2));
|
||||
|
||||
// normalize and make sure they are equivalent again
|
||||
tmp2.normalize();
|
||||
diff --git a/xulrunner/stub/nsXULStub.cpp b/xulrunner/stub/nsXULStub.cpp
|
||||
index dc3a592..b270175 100644
|
||||
--- a/xulrunner/stub/nsXULStub.cpp
|
||||
+++ b/xulrunner/stub/nsXULStub.cpp
|
||||
@@ -490,14 +490,6 @@ main(int argc, char **argv)
|
||||
range.lower, range.upper);
|
||||
return 1;
|
||||
}
|
||||
-#ifdef XP_UNIX
|
||||
- // Using a symlinked greDir will fail during startup. Not sure why, but if
|
||||
- // we resolve the symlink, everything works as expected.
|
||||
- char resolved_greDir[MAXPATHLEN] = "";
|
||||
- if (realpath(greDir, resolved_greDir) && *resolved_greDir) {
|
||||
- strncpy(greDir, resolved_greDir, MAXPATHLEN);
|
||||
- }
|
||||
-#endif
|
||||
}
|
||||
|
||||
#ifdef XP_OS2
|
||||
diff --git a/xpcom/io/nsLocalFileOSX.mm b/xpcom/io/nsLocalFileOSX.mm
|
||||
index bbe2b26..6f51638 100644
|
||||
--- a/xpcom/io/nsLocalFileOSX.mm
|
||||
+++ b/xpcom/io/nsLocalFileOSX.mm
|
||||
@@ -1068,6 +1068,9 @@ NS_IMETHODIMP nsLocalFile::Clone(nsIFile **_retval)
|
||||
|
||||
NS_IMETHODIMP nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
|
||||
{
|
||||
+ struct STAT st, inst;
|
||||
+ PRBool exists = PR_TRUE;
|
||||
+
|
||||
NS_ENSURE_ARG(inFile);
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
*_retval = PR_FALSE;
|
||||
@@ -1077,7 +1080,27 @@ NS_IMETHODIMP nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
- *_retval = !strcmp(mPath, inPath.get());
|
||||
+ if (STAT(mPath.get(), &st) == -1) {
|
||||
+ // try lstat it may be a symlink
|
||||
+ if (LSTAT(mPath.get(), &st) == -1)
|
||||
+ exists = PR_FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if (exists && (STAT(inPath.get(), &inst) == -1)) {
|
||||
+ // try lstat it may be a symlink
|
||||
+ if (LSTAT(inPath.get(), &inst) == -1)
|
||||
+ exists = PR_FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if (!exists) {
|
||||
+ // We don't need to worry about "/foo/" vs. "/foo" here
|
||||
+ // because trailing slashes are stripped on init.
|
||||
+ *_retval = !strcmp(inPath.get(), mPath.get());
|
||||
+ return NS_OK;
|
||||
+ }
|
||||
+
|
||||
+ *_retval = (st.st_ino == inst.st_ino) &&
|
||||
+ (st.st_dev == inst.st_dev);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
|
||||
index 289600a..bdf0f81 100644
|
||||
--- a/xpcom/io/nsLocalFileUnix.cpp
|
||||
+++ b/xpcom/io/nsLocalFileUnix.cpp
|
||||
@@ -1400,6 +1400,9 @@ nsLocalFile::IsSpecial(PRBool *_retval)
|
||||
NS_IMETHODIMP
|
||||
nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
|
||||
{
|
||||
+ struct STAT st, inst;
|
||||
+ PRBool exists = PR_TRUE;
|
||||
+
|
||||
NS_ENSURE_ARG(inFile);
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
*_retval = PR_FALSE;
|
||||
@@ -1409,9 +1412,27 @@ nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
- // We don't need to worry about "/foo/" vs. "/foo" here
|
||||
- // because trailing slashes are stripped on init.
|
||||
- *_retval = !strcmp(inPath.get(), mPath.get());
|
||||
+ if (STAT(mPath.get(), &st) == -1) {
|
||||
+ // try lstat it may be a symlink
|
||||
+ if (LSTAT(mPath.get(), &st) == -1)
|
||||
+ exists = PR_FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if (exists && (STAT(inPath.get(), &inst) == -1)) {
|
||||
+ // try lstat it may be a symlink
|
||||
+ if (LSTAT(inPath.get(), &inst) == -1)
|
||||
+ exists = PR_FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if (!exists) {
|
||||
+ // We don't need to worry about "/foo/" vs. "/foo" here
|
||||
+ // because trailing slashes are stripped on init.
|
||||
+ *_retval = !strcmp(inPath.get(), mPath.get());
|
||||
+ return NS_OK;
|
||||
+ }
|
||||
+
|
||||
+ *_retval = (st.st_ino == inst.st_ino) &&
|
||||
+ (st.st_dev == inst.st_dev);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -5,11 +5,15 @@ buildPhase() {
|
||||
}
|
||||
|
||||
installPhase() {
|
||||
substituteInPlace install.sh --replace /bin/pwd pwd
|
||||
substituteInPlace install --replace /bin/pwd pwd
|
||||
substituteInPlace install --replace /usr/local "$out"
|
||||
|
||||
# Note: the "no" is because the install scripts asks whether we
|
||||
# want to install icons in some system-wide directories.
|
||||
echo no | ./install.sh --prefix=$out
|
||||
|
||||
ensureDir "$out"
|
||||
|
||||
./install --text --system
|
||||
|
||||
[ -z ${system##*64*} ] && suf=64
|
||||
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
{ stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libXt, glibc
|
||||
, makeDesktopItem
|
||||
, makeDesktopItem, freetype, fontconfig, libXft, libXrender
|
||||
}:
|
||||
|
||||
assert stdenv.isLinux && stdenv.gcc.gcc != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opera-10.10";
|
||||
name = "opera-10.63";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://mirror.liteserver.nl/pub/opera/linux/1010/final/en/i386/shared/opera-10.10.gcc4-shared-qt3.i386.tar.bz2";
|
||||
sha256 = "0y8xahwgx5jw83ky4zkw8ixyfgnd2xg9k0zq15yivhimi60fsppc";
|
||||
url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.i386.linux.tar.bz2";
|
||||
sha256 = "dd105d602a4b8897749a4cb9610f8bfe2d07d4f4cc9bf3905930c65592737259";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://mirror.liteserver.nl/pub/opera/linux/1010/final/en/x86_64/opera-10.10.gcc4-shared-qt3.x86_64.tar.bz2";
|
||||
sha256 = "1z0zgalqv9lnf1jsg3zg9diqfyszh75r7m1dbkifkdawn4zv4q3s";
|
||||
url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.x86_64.linux.tar.bz2";
|
||||
sha256 = "da8ae14cf317364ab0295102220246b205bf30c59c00cadb571395c90dda7c74";
|
||||
}
|
||||
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
|
||||
|
||||
@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
|
||||
# `operapluginwrapper' requires libXt. Adding it makes startup faster
|
||||
# and omits error messages (on x86).
|
||||
libPath =
|
||||
let list = [ stdenv.gcc.gcc glibc qt zlib libX11 libXt libXext libSM libICE];
|
||||
let list = [ stdenv.gcc.gcc glibc qt zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig
|
||||
libXrender];
|
||||
in stdenv.lib.makeLibraryPath list
|
||||
+ ":" + (if stdenv.system == "x86_64-linux" then stdenv.lib.makeSearchPath "lib64" list else "");
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, zlib, openssl, tcl}:
|
||||
|
||||
let
|
||||
version = "20101117133825";
|
||||
version = "20101207133137";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
|
||||
sha256 = "0h4g7qsbz5vyd3zxywcc2pf6vf3gavxqznpx8gn47j8y6mjp4byn";
|
||||
sha256 = "1yx35gq9ialvnvjn1r5yar4zxgy0rkxzyz9paxwy8qan3qb53mwz";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
rec {
|
||||
version="0.5.0.10325";
|
||||
name="veracity-0.5.0.10325";
|
||||
hash="07lbfdfbjnd0xmbaw799dphb7i8f6w176afwaw0sd65ksjkbfc39";
|
||||
version="0.5.5.10349";
|
||||
name="veracity-0.5.5.10349";
|
||||
hash="1059cf0p0kpmylk9228an1kvz49s3d6sd3ncz6dw804z79q16s66";
|
||||
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
|
||||
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.0.10325.tar.gz";
|
||||
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.5.10349.tar.gz";
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -46,7 +46,7 @@ xkb_symbols "altgr-intl-rich" {
|
||||
key <AE05> { [ 5, percent, EuroSign, approxeq ] };
|
||||
key <AE06> { [ 6, asciicircum, dead_circumflex, dead_stroke ] };
|
||||
key <AE07> { [ 7, ampersand, dead_horn ] };
|
||||
key <AE08> { [ 8, asterisk, dead_ogonek ] };
|
||||
key <AE08> { [ 8, asterisk, dead_ogonek, infinity ] };
|
||||
key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] };
|
||||
key <AE10> { [ 0, parenright,rightsinglequotemark,dead_abovering ] };
|
||||
key <AE11> { [ minus, underscore, yen, dead_belowdot ] };
|
||||
@ -68,8 +68,8 @@ xkb_symbols "altgr-intl-rich" {
|
||||
key <AC01> { [ a, A, aacute, Aacute ] };
|
||||
key <AC02> { [ s, S, ssharp, section ] };
|
||||
key <AC03> { [ d, D, eth, ETH ] };
|
||||
key <AC04> { [ f, F ] };
|
||||
key <AC05> { [ g, G ] };
|
||||
key <AC04> { [ f, F, union, intersection ] };
|
||||
key <AC05> { [ g, G, eng, ENG ] };
|
||||
key <AC06> { [ h, H, hyphen, nobreakspace ] };
|
||||
key <AC07> { [ j, J, idiaeresis, Idiaeresis ] };
|
||||
key <AC08> { [ k, K ] };
|
||||
@ -80,7 +80,7 @@ xkb_symbols "altgr-intl-rich" {
|
||||
key <AB01> { [ z, Z, ae, AE ] };
|
||||
key <AB02> { [ x, X, oe, OE ] };
|
||||
key <AB03> { [ c, C, copyright, cent ] };
|
||||
key <AB04> { [ v, V, registered, registered ] };
|
||||
key <AB04> { [ v, V, registered, trademark ] };
|
||||
key <AB05> { [ b, B, emdash, endash ] };
|
||||
key <AB06> { [ n, N, nu, numerosign ] };
|
||||
key <AB07> { [ m, M, mu, plusminus ] };
|
||||
|
||||
@ -8,7 +8,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "ColorSchemes";
|
||||
module = "kdeaccessibility";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "IconThemes";
|
||||
module = "kdeaccessibility";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "jovie";
|
||||
module = "kdeaccessibility";
|
||||
version = "0.6.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "jovie/jovie/main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kmag";
|
||||
module = "kdeaccessibility";
|
||||
version = "1.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "kmag/version.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kmousetool";
|
||||
module = "kdeaccessibility";
|
||||
version = "1.12";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "kmousetool/kmousetool/version.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kmouth";
|
||||
module = "kdeaccessibility";
|
||||
version = "1.1.1";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "kmouth/version.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -20,7 +20,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "kdeadmin";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "aurorae";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "ColorSchemes";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "desktopthemes";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "emoticons";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "HighResolutionWallpapers";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package rec {
|
||||
name = "kscreensaver";
|
||||
module = "kdeartwork";
|
||||
version = "1.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "kscreensaver/kpartsaver/kpartsaver.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "IconThemes";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "styles";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "sounds";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "wallpapers";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package rec {
|
||||
kde = {
|
||||
name = "WeatherWallpapers";
|
||||
module = "kdeartwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ kde.package {
|
||||
license = "LGPL";
|
||||
kde = {
|
||||
name = "kdebase-runtime";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "kdebase-workspace";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "kdebase";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ kde.package rec {
|
||||
license = "LGPL";
|
||||
kde = {
|
||||
name = "kdebindings";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
|
||||
# Various packages (e.g. kdesdk) have been split up into many
|
||||
# smaller packages. Some people may want to install the entire
|
||||
|
||||
@ -23,7 +23,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "kdeedu";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "kdegames";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "kdegraphics";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,19 +1,7 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
rec {
|
||||
manifest = import ./manifest.nix;
|
||||
|
||||
kdeSrc = { stable ? true, subdir ? null, module, release, sha256 ? null } :
|
||||
fetchurl {
|
||||
url = "mirror://kde/" + (if stable then "" else "un") + "stable/"
|
||||
+ (if subdir == null then "${release}/src" else subdir)
|
||||
+ "/${module}-${release}.tar.bz2";
|
||||
sha256 =
|
||||
if sha256 != null then sha256
|
||||
else builtins.getAttr "${module}-${release}.tar.bz2" manifest;
|
||||
};
|
||||
|
||||
defaultArgs = {name, stable ? true, subdir ? null, version,
|
||||
defaultArgs = {name, stable ? true, version,
|
||||
module ? name, release ? version, ... }:
|
||||
|
||||
assert (name == module) -> (release == version);
|
||||
@ -22,7 +10,15 @@ rec {
|
||||
{
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = kdeSrc { inherit stable subdir module release; };
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/" + (if stable then "" else "un")
|
||||
+ "stable/${release}/src/${module}-${release}.tar.bz2";
|
||||
sha256 = (stdenv.lib.findFirst
|
||||
(x: x.module == module)
|
||||
(throw "No module ${module} in release ${release}!")
|
||||
(import (./manifest + "-${release}.nix"))
|
||||
).sha256;
|
||||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
|
||||
|
||||
30
pkgs/desktops/kde-4.5/kde-package/kde-manifest.sh
Executable file
30
pkgs/desktops/kde-4.5/kde-package/kde-manifest.sh
Executable file
@ -0,0 +1,30 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Usage: download kde release to $dir, then run
|
||||
# $0 $dir
|
||||
|
||||
dir=$1
|
||||
|
||||
if [[ ! -d "${dir}" ]]; then
|
||||
echo "${dir} is not a directory (or doesn't exist)!" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \
|
||||
sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//')
|
||||
|
||||
echo "Detected release ${release}" >&2
|
||||
|
||||
exec > "manifest-${release}.nix"
|
||||
echo "["
|
||||
for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do
|
||||
module=${i%-${release}.tar.bz2}
|
||||
echo -n "${module}.. " >&2
|
||||
hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
|
||||
echo "{"
|
||||
echo " module = \"${module}\";"
|
||||
echo " sha256 = \"${hash}\";"
|
||||
echo "}"
|
||||
echo $hash >&2
|
||||
done
|
||||
echo "]"
|
||||
82
pkgs/desktops/kde-4.5/kde-package/manifest-4.5.4.nix
Normal file
82
pkgs/desktops/kde-4.5/kde-package/manifest-4.5.4.nix
Normal file
@ -0,0 +1,82 @@
|
||||
[
|
||||
{
|
||||
module = "kdeaccessibility";
|
||||
sha256 = "0jd07n143r2610a261xx193zkigs30a4p645pzyw3dsi6la8ms0r";
|
||||
}
|
||||
{
|
||||
module = "kdeadmin";
|
||||
sha256 = "0frf4clljqnynxv67hqypsfaifdrgbgc0zb9lcckjialc03f2kfm";
|
||||
}
|
||||
{
|
||||
module = "kdeartwork";
|
||||
sha256 = "08260bml12y3xwr61q2qxrp0aqcshi14h7n93b12q0m9fs8n87x0";
|
||||
}
|
||||
{
|
||||
module = "kdebase";
|
||||
sha256 = "1k9hla4qwrgz12g4n72c46w6b1srjnwf95zxhj2axqdw4k4hfj6z";
|
||||
}
|
||||
{
|
||||
module = "kdebase-runtime";
|
||||
sha256 = "0rqrx9hz266dc9l7sn2pakqy36w5919gchwc4ghb5qzira3jjg1h";
|
||||
}
|
||||
{
|
||||
module = "kdebase-workspace";
|
||||
sha256 = "09a4jsa3w4v4ldsh244isbbrsv350xcmd2py0sb3lvja7gf9wqhw";
|
||||
}
|
||||
{
|
||||
module = "kdebindings";
|
||||
sha256 = "0vx7fhg74g0b2xcaxjybxci34kyc10h1i29qsdqr1005j01cdvj0";
|
||||
}
|
||||
{
|
||||
module = "kdeedu";
|
||||
sha256 = "080pw86l55jfhdxm3a18qh4h1p7k6w3cb37g8ymfsyx3k3diil6x";
|
||||
}
|
||||
{
|
||||
module = "kdegames";
|
||||
sha256 = "12p209n673fxnm9wsgc7by46z4hs3d7b3hzwgcxggzag0kyhx3s5";
|
||||
}
|
||||
{
|
||||
module = "kdegraphics";
|
||||
sha256 = "1b4n1ss5pg213blqrkbk0pqchfr336rybqfkcb8scv1blx0w83qs";
|
||||
}
|
||||
{
|
||||
module = "kdelibs";
|
||||
sha256 = "0c4ybrpdw3dblv68mj6sa7q13kx1z64f8lpakxf6f7vw1ish2dph";
|
||||
}
|
||||
{
|
||||
module = "kdemultimedia";
|
||||
sha256 = "16k8l5h4m2wjpzpzflk2agmg48m1gj4fyzjp67z446lmb1m8jap7";
|
||||
}
|
||||
{
|
||||
module = "kdenetwork";
|
||||
sha256 = "1g0hy92ixh2nzvasjm4ms8n8jyy777d909gjv16ph8g5w2pxj61w";
|
||||
}
|
||||
{
|
||||
module = "kdepimlibs";
|
||||
sha256 = "1yc615qf3qihlj69glm4amdrbck33vagp5xmgnp6mny5vhvdc85b";
|
||||
}
|
||||
{
|
||||
module = "kdeplasma-addons";
|
||||
sha256 = "0q9r8lafc3aa15smaj1r5kcyz2jw7lpbnp6qxanllfbv7c4b37nb";
|
||||
}
|
||||
{
|
||||
module = "kdesdk";
|
||||
sha256 = "1ia336cfs42h8b3jahd9hb2ynahyiccx6y8dfk420xvyy024i2ra";
|
||||
}
|
||||
{
|
||||
module = "kdetoys";
|
||||
sha256 = "12755p77r5fv2lfr78jrvcx8vg1mnsfsb1g8hpr6b59w5hh2k2mm";
|
||||
}
|
||||
{
|
||||
module = "kdeutils";
|
||||
sha256 = "07g96bwy8h4ydj8gdnm1cs7vgm96s3m9c2d36d8r3w6apvh5pjkc";
|
||||
}
|
||||
{
|
||||
module = "kdewebdev";
|
||||
sha256 = "1ng0rbrizqmqm4l0j9xahf0dwh5674cimzkzrlgj09dl4a603xar";
|
||||
}
|
||||
{
|
||||
module = "oxygen-icons";
|
||||
sha256 = "0j9d4h3nl3vqwh4fi1zysahgvwd0xswqa25p8jl6hl86rnawhjcy";
|
||||
}
|
||||
]
|
||||
@ -1,94 +0,0 @@
|
||||
builtins.listToAttrs
|
||||
[
|
||||
{
|
||||
name = "polkit-qt-1-0.96.1.tar.bz2";
|
||||
value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
|
||||
}
|
||||
{
|
||||
name = "kdeaccessibility-4.5.2.tar.bz2";
|
||||
value = "1iv94vvngxs94vl3ssjq1y2sd50wcc7s7gvngwqj534qjd1fj3a2";
|
||||
}
|
||||
{
|
||||
name = "kdeadmin-4.5.2.tar.bz2";
|
||||
value = "1gy0p9vfx8k1ni92n6p8fhq32i7dazs2vls7f5na8hc6s5wsn861";
|
||||
}
|
||||
{
|
||||
name = "kdeartwork-4.5.2.tar.bz2";
|
||||
value = "0y7rj70x861a07r80skldzkkbqhh41gsv2vh8cg1n4hqq4l5nj5y";
|
||||
}
|
||||
{
|
||||
name = "kdebase-4.5.2.tar.bz2";
|
||||
value = "1hwcd3k25bhi73hps4rqc3rh87sdf8syvv0jx4prc6qd2cpjxvp6";
|
||||
}
|
||||
{
|
||||
name = "kdebase-runtime-4.5.2.tar.bz2";
|
||||
value = "04dbjhkl1zfys6rhjrk3dmqqwzw4hh0hyrm6rn8f1gbiqfcgrkfy";
|
||||
}
|
||||
{
|
||||
name = "kdebase-workspace-4.5.2.tar.bz2";
|
||||
value = "17jd2ixvsk9f0z30ksmjaasdfza39c80d0ylzkpdjf9nkiiv1pn8";
|
||||
}
|
||||
{
|
||||
name = "kdebindings-4.5.2.tar.bz2";
|
||||
value = "077n2g4mmfkg7xvz7v8f0m79sp2f72f56ari14j4x073vgf51hfs";
|
||||
}
|
||||
{
|
||||
name = "kdeedu-4.5.2.tar.bz2";
|
||||
value = "1ljp5jm5iml2s1jdi1n5h8hzqsl7pq98vcdj9bi1pjq3l87gh4i5";
|
||||
}
|
||||
{
|
||||
name = "kdegames-4.5.2.tar.bz2";
|
||||
value = "0vld69dz2src7ya92a5nqi0739whldxvgphyxm9bavk69x6g129c";
|
||||
}
|
||||
{
|
||||
name = "kdegraphics-4.5.2.tar.bz2";
|
||||
value = "0zl1df2srnf7xsivyws3zicrj6bginjn6rgi0iq6hx3q9l5lah2d";
|
||||
}
|
||||
{
|
||||
name = "kdelibs-4.5.2.tar.bz2";
|
||||
value = "1hxlqvcwys1snhahrv1lryv95sh042jikscqmm6vind03pcqrq09";
|
||||
}
|
||||
{
|
||||
name = "kdemultimedia-4.5.2.tar.bz2";
|
||||
value = "1gxmal28m83r9imasv3nw4c091kllpkivfws8aal63r0dg5n5fy2";
|
||||
}
|
||||
{
|
||||
name = "kdenetwork-4.5.2.tar.bz2";
|
||||
value = "0k59zf8m34b7xp4h9mj328gjnr73l2d7vf4b4aikv0m2damryp7a";
|
||||
}
|
||||
{
|
||||
name = "kdepimlibs-4.5.2.tar.bz2";
|
||||
value = "0bag9jhr1azadcz01rfdhdl8nfk6w4cjw3w2zxardar5ri129v2b";
|
||||
}
|
||||
{
|
||||
name = "kdeplasma-addons-4.5.2.tar.bz2";
|
||||
value = "1pdlwbadk3qyh9rxj4j2b2wjfn7dmi9jcargahc7p7pb8mf0pizw";
|
||||
}
|
||||
{
|
||||
name = "kdesdk-4.5.2.tar.bz2";
|
||||
value = "0ii7gmshw4207i0hlzz3fl5kc21i4vx2v29jw10ri1vz7pmv9v9q";
|
||||
}
|
||||
{
|
||||
name = "kdetoys-4.5.2.tar.bz2";
|
||||
value = "01kn14lh00ig33r98xjly37ad7w1cwvc4l02hswbqr99smksxn33";
|
||||
}
|
||||
{
|
||||
name = "kdeutils-4.5.2.tar.bz2";
|
||||
value = "1rh4s60wx253adw7z1j0sp29l43y7xvd2516bwxq0sn8bmp3w7nr";
|
||||
}
|
||||
{
|
||||
name = "kdewebdev-4.5.2.tar.bz2";
|
||||
value = "02baf8h4v688x03hxr8kliglia1chlarnmzc0gbpnpry9zhwpp5p";
|
||||
}
|
||||
{
|
||||
name = "oxygen-icons-4.5.2.tar.bz2";
|
||||
value = "0c8hy3vsqpm6n52v6w3igj78s0qy6cb3m6fm8qh795rpw495d5yj";
|
||||
}
|
||||
{
|
||||
name = "kdepim-4.4.7.tar.bz2";
|
||||
value = "0jjv1y23hwlkwdvqf3pcs37hzcnnxz5baa4vw1wznj4v816ixj1s";
|
||||
}
|
||||
{
|
||||
name = "kdepim-runtime-4.4.7.tar.bz2";
|
||||
value = "196gkz2jbphw4r9i91jaz6wd4wnyxavc1na2kpp9s9cvmiafcp7m";
|
||||
}]
|
||||
@ -3,8 +3,8 @@
|
||||
let
|
||||
overrides = { };
|
||||
|
||||
defaultRelease = "4.5.3";
|
||||
releases = [ "4.5.1" "4.5.2" "4.5.3" ];
|
||||
defaultRelease = "4.5.4";
|
||||
releases = [ "4.5.1" "4.5.2" "4.5.3" "4.5.4" ];
|
||||
|
||||
sanitizeString = replaceChars [ "@" "." ] [ "_" "_" ];
|
||||
getOverride = name: attrByPath [name] {} overrides;
|
||||
|
||||
222
pkgs/desktops/kde-4.5/l10n/manifest-4.5.4.nix
Normal file
222
pkgs/desktops/kde-4.5/l10n/manifest-4.5.4.nix
Normal file
@ -0,0 +1,222 @@
|
||||
[
|
||||
{
|
||||
lang = "ar";
|
||||
sha256 = "1yn5dvd2d6wk12434x7v463ywz0sn1d9z2fhsbhclwzns3p07brn";
|
||||
}
|
||||
{
|
||||
lang = "bg";
|
||||
sha256 = "0dnhywbld5ll4wvpl42kn6bnffjr72d4wp36446ffnwkqvhwg0bm";
|
||||
}
|
||||
{
|
||||
lang = "ca";
|
||||
sha256 = "0i6cplf7fsr4q6yyv2y4sj1d44zd4d81h3mh6fbc0icq42im4pyq";
|
||||
}
|
||||
{
|
||||
lang = "ca@valencia";
|
||||
sha256 = "1p55xn6k47ag4ph8byaasp27sczh6asqj0x8677hacmm01vps4xy";
|
||||
}
|
||||
{
|
||||
lang = "cs";
|
||||
sha256 = "16yz0yc8b0g2kzpywi4a0xys6rkj47n45l3i4f39ycypxavqya0v";
|
||||
}
|
||||
{
|
||||
lang = "da";
|
||||
sha256 = "0pc4im8rd4n6wn65gwyiyl4c414kp1gspw45xzj3mssbpghhn0ic";
|
||||
}
|
||||
{
|
||||
lang = "de";
|
||||
sha256 = "1apdjmyb3f07rjld43yabr3bvvb8xikhlzr0zmv37y43bzbvlk9x";
|
||||
}
|
||||
{
|
||||
lang = "el";
|
||||
sha256 = "1irh0pjaxfx893792s3wl0k8m9cy6c428isdlnij1mdbpyg4pw9d";
|
||||
}
|
||||
{
|
||||
lang = "en_GB";
|
||||
sha256 = "08248znhd1pxgx6izi8pfrccm31fm083bq4i9d9f4m3b9svxj63i";
|
||||
}
|
||||
{
|
||||
lang = "eo";
|
||||
sha256 = "1ydizv2sggfdwlh9vlf9dzf7pwjvqj3aa1vx1wdb1qzp913kixy9";
|
||||
}
|
||||
{
|
||||
lang = "es";
|
||||
sha256 = "11545n83bknw6a1h1dw3sxlswhqj8mm0nm9nricrmjwxhi2r2gma";
|
||||
}
|
||||
{
|
||||
lang = "et";
|
||||
sha256 = "1dpk4h5yfg5ljf5l6yg5i8r4v4k5cq4dq8bdir883lwlkvzmql5j";
|
||||
}
|
||||
{
|
||||
lang = "eu";
|
||||
sha256 = "1qfhqbpxh1mgxbzh7l8gb0xsm9pi50mq48ya32s8a502khwwxh41";
|
||||
}
|
||||
{
|
||||
lang = "fi";
|
||||
sha256 = "11a03s37sd1fn0s0yx8lf369l8da3qmf6aqagrlsn3cj9rwa3pn6";
|
||||
}
|
||||
{
|
||||
lang = "fr";
|
||||
sha256 = "0f739jlpxfqyd41y0l5ydmdjwmn3ihvcxihl3v2cmwyaxfhvapbj";
|
||||
}
|
||||
{
|
||||
lang = "fy";
|
||||
sha256 = "057n58mnryjxqh3v9vyf5qysf6xilmiw1p6gnsdnmqvznccmx7j7";
|
||||
}
|
||||
{
|
||||
lang = "ga";
|
||||
sha256 = "1wbc9mxj7yf630x3dqabv783dv012k6xna362a7cy3pzbdr49kl2";
|
||||
}
|
||||
{
|
||||
lang = "gl";
|
||||
sha256 = "0vg248wbmfmcdskq60nafnkly9l3i32yz21xbwjmnvs2drwphayz";
|
||||
}
|
||||
{
|
||||
lang = "gu";
|
||||
sha256 = "14misxmdi5v26fql40vqwjci93l5jrjqrwd049pj5i0jnrjhy5rd";
|
||||
}
|
||||
{
|
||||
lang = "he";
|
||||
sha256 = "19h2ca93kqr293qjg0gy5mpgw0x3cgdmjs70k42781zl4xz1prjp";
|
||||
}
|
||||
{
|
||||
lang = "hi";
|
||||
sha256 = "0qhp5ml6jindbxds8mllnsyi5c0mlnmwppfdxjapg0m229f6dgh6";
|
||||
}
|
||||
{
|
||||
lang = "hr";
|
||||
sha256 = "08i7lg3rii1lciy42ny65k43sn4lv85jl3464rn7a91yvbk18iym";
|
||||
}
|
||||
{
|
||||
lang = "hu";
|
||||
sha256 = "0wfxqcjpi0yl7xsnpb5k25jl0c7haf9dr2f85wmw6iv2iamdkfmh";
|
||||
}
|
||||
{
|
||||
lang = "ia";
|
||||
sha256 = "1ixqr026g4fi7fbrr7wi49h3662b3jdb8nsfqs5dd41mjchk20c8";
|
||||
}
|
||||
{
|
||||
lang = "id";
|
||||
sha256 = "079n7q5nx5mass01dqqngvajjfs4qdcdl9d9jdzkn4fzhffpgdap";
|
||||
}
|
||||
{
|
||||
lang = "is";
|
||||
sha256 = "150snwlbyv7461bh6yfl8cq5dv5alxf37grdgq2zynkpnx9i3s8k";
|
||||
}
|
||||
{
|
||||
lang = "it";
|
||||
sha256 = "07bza0by629gywqxkxchzvlw8fs1swg7ivpr3zn48lm8ka9xqx3s";
|
||||
}
|
||||
{
|
||||
lang = "ja";
|
||||
sha256 = "0bpjahc276wm0fscnlffqq2m838jkir17s4v12q0zr0dmryxd7lc";
|
||||
}
|
||||
{
|
||||
lang = "kk";
|
||||
sha256 = "11cyklk2j6igmq71j7fcr9gg8jn99lq6z9yi77p7hn4rid7dflgp";
|
||||
}
|
||||
{
|
||||
lang = "km";
|
||||
sha256 = "0d7f7zz6ys3yfq3wlbk621yy7zzblzb3zv8g849mbpb5m5rl6bsg";
|
||||
}
|
||||
{
|
||||
lang = "kn";
|
||||
sha256 = "0hcri8am13sy7qnl0459b7cphb0jw4fc40nqw3crrdrsr8677abj";
|
||||
}
|
||||
{
|
||||
lang = "ko";
|
||||
sha256 = "0zz6k2xgfvb80031dinsyp6crgr1iy0iv1d0m2bq1985aa98rrih";
|
||||
}
|
||||
{
|
||||
lang = "lt";
|
||||
sha256 = "1knzjdhl98h8jdad5dwkqkiqs7wwib57jvs3jf0zacvqbcpchwb7";
|
||||
}
|
||||
{
|
||||
lang = "lv";
|
||||
sha256 = "0pm9k4ww10dnyvkgkm6n8cddwlj5431k17sbshgmgjnw9bszk798";
|
||||
}
|
||||
{
|
||||
lang = "ml";
|
||||
sha256 = "06j6124q2mmpjs5y3gqy7fxgldwnvq5683394s3m23n8q81yg0wj";
|
||||
}
|
||||
{
|
||||
lang = "nb";
|
||||
sha256 = "180vsfx87ynizzga878757qjnj1k91qad57iisw5hqcxk2fg3v22";
|
||||
}
|
||||
{
|
||||
lang = "nds";
|
||||
sha256 = "16i9wz1lzkqij61raffm8h4l6fjri4h9ybbgxy7nlqiqaj67jghl";
|
||||
}
|
||||
{
|
||||
lang = "nl";
|
||||
sha256 = "1clrmccm2vdvi9v7f2yqhhf69iln57m7hpw2638is6fs31ivyr1v";
|
||||
}
|
||||
{
|
||||
lang = "nn";
|
||||
sha256 = "0447v1wzbb7bvmpbcyav3gv45vv4zl9p9nj3sk45c8md1by82hc3";
|
||||
}
|
||||
{
|
||||
lang = "pa";
|
||||
sha256 = "1fbrfczjp2yliz13swha2f4767jwzy9bi1hb1dqi2yjhyqhj7k6p";
|
||||
}
|
||||
{
|
||||
lang = "pl";
|
||||
sha256 = "1xzsfrxwgf6kmfa1j5dy699rxaxmc3vpcv8zgqi96kwwhqmmwn9p";
|
||||
}
|
||||
{
|
||||
lang = "pt";
|
||||
sha256 = "08gdvkbqfshbgf6zwyg05g05kc7hm81s01z7p67jc2q80vkl7ahz";
|
||||
}
|
||||
{
|
||||
lang = "pt_BR";
|
||||
sha256 = "05x600wzp7x1hx262pmb27js146j6sv9c3mbw748q1l3c7cdp0xs";
|
||||
}
|
||||
{
|
||||
lang = "ro";
|
||||
sha256 = "13r08mka2j6zyz4a3ycs57zaj4ipjdv12sbag0bjwk9dx5x45xs5";
|
||||
}
|
||||
{
|
||||
lang = "ru";
|
||||
sha256 = "0yw8aax09yl89ab15rlc66lmx4x552hkg5fd89vnhlbk2h9v1rms";
|
||||
}
|
||||
{
|
||||
lang = "sk";
|
||||
sha256 = "1k905nmvbig7qmbq83y9jbgp72vg9l1mj2iahqz4r726zpqz4fxq";
|
||||
}
|
||||
{
|
||||
lang = "sl";
|
||||
sha256 = "1ywy35wj8aa17q7hf692dwi7s0xi8ns9p0pmfm13nz8214rbmc4q";
|
||||
}
|
||||
{
|
||||
lang = "sr";
|
||||
sha256 = "0rqycg08wgrcvphd4mxjsk460nflpv78r0wil4bsqfa8i774v8r0";
|
||||
}
|
||||
{
|
||||
lang = "sv";
|
||||
sha256 = "0rl2hdnhn9r5yk4zp1sxbxhqchs411kffs5krdym19a3kl83zp36";
|
||||
}
|
||||
{
|
||||
lang = "th";
|
||||
sha256 = "0n62zs6sjfdkyxs7n6hmji8bzl9y2r4gsqs0jysmjkz23y6160bh";
|
||||
}
|
||||
{
|
||||
lang = "tr";
|
||||
sha256 = "0phc1cbp98bilvscxnxnbzwgk85ilws5l3n3bsgbkqrh5rqz9fyn";
|
||||
}
|
||||
{
|
||||
lang = "uk";
|
||||
sha256 = "1hy7hriikvmpjgmxf1zw2j0hkv6f8ig8v20damcivkid3maj307g";
|
||||
}
|
||||
{
|
||||
lang = "wa";
|
||||
sha256 = "11zwqkv1qpqgxxqvq0y92xyq88czzyx76krx1qbc0d50mv5zk91r";
|
||||
}
|
||||
{
|
||||
lang = "zh_CN";
|
||||
sha256 = "0pn3xd91ka20mf35rsdyf9sp3cwf9dpxn7lradz2380mkira6mp0";
|
||||
}
|
||||
{
|
||||
lang = "zh_TW";
|
||||
sha256 = "0zx879d0fkgblfq6574kq4wdhip729ni8v1cjhg0v97l7pnridzk";
|
||||
}
|
||||
]
|
||||
@ -36,7 +36,7 @@ kde.package {
|
||||
license = "LGPL";
|
||||
kde = {
|
||||
name = "kdelibs";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "kdemultimedia";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "kdenetwork";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,22 +1,27 @@
|
||||
{ kde, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
|
||||
{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
|
||||
, kdelibs, kdepimlibs
|
||||
, automoc4, phonon, akonadi, soprano, strigi}:
|
||||
|
||||
kde.package {
|
||||
kde.package rec {
|
||||
buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
|
||||
kdelibs kdepimlibs
|
||||
automoc4 phonon akonadi soprano strigi ];
|
||||
prePatch = ''
|
||||
find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
|
||||
sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "KDE PIM runtime";
|
||||
homepage = http://www.kde.org;
|
||||
license = "GPL";
|
||||
kde = rec {
|
||||
kde = {
|
||||
name = "kdepim-runtime";
|
||||
version = "4.4.7";
|
||||
subdir = "kdepim-${version}/src";
|
||||
version = "4.4.8";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ kde, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
|
||||
{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
|
||||
, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
|
||||
, automoc4, akonadi, qca2}:
|
||||
|
||||
kde.package {
|
||||
kde.package rec {
|
||||
|
||||
buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt
|
||||
shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ];
|
||||
@ -13,6 +13,12 @@ kde.package {
|
||||
mkdir -p $out/nix-support/
|
||||
echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
|
||||
sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "KDE PIM tools";
|
||||
longDescription = ''
|
||||
@ -20,10 +26,9 @@ kde.package {
|
||||
'';
|
||||
license = "GPL";
|
||||
homepage = http://pim.kde.org;
|
||||
kde = rec {
|
||||
kde = {
|
||||
name = "kdepim";
|
||||
version = "4.4.7";
|
||||
subdir = "kdepim-${version}/src";
|
||||
version = "4.4.8";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ kde.package {
|
||||
license = "LGPL";
|
||||
kde = {
|
||||
name = "kdepimlibs";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "kdeplasma-addons";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "cervisia";
|
||||
module = "kdesdk";
|
||||
version = "3.5.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "cervisia/version.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "dolphin-plugins";
|
||||
module = "kdesdk";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kapptemplate";
|
||||
module = "kdesdk";
|
||||
version = "0.1";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "kapptemplate/main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kate";
|
||||
module = "kdesdk";
|
||||
version = "3.5.2"; # (release.major-1).(release.minor).(release.patch)
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kbugbuster";
|
||||
module = "kdesdk";
|
||||
version = "3.80.3";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "version.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kcachegrind";
|
||||
module = "kdesdk";
|
||||
version = "0.6";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "CMakeLists.txt";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "kdeaccounts-plugin";
|
||||
module = "kdesdk";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ kde.package {
|
||||
name = "kioslave-perldoc";
|
||||
module = "kdesdk";
|
||||
version = "0.9.1";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "kioslave/perldoc/perldoc.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -11,7 +11,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "kioslave-svn";
|
||||
module = "kdesdk";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "kmtrace";
|
||||
module = "kdesdk";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kompare";
|
||||
module = "kdesdk";
|
||||
version = "4.0.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kpartloader";
|
||||
module = "kdesdk";
|
||||
version = "1.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "kpartloader.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "kprofilemethod";
|
||||
module = "kdesdk";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kstartperf";
|
||||
module = "kdesdk";
|
||||
version = "1.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "kstartperf.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kuiviewer";
|
||||
module = "kdesdk";
|
||||
version = "0.1";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -13,7 +13,7 @@ kde.package {
|
||||
name = "lokalize";
|
||||
module = "kdesdk";
|
||||
version = "1.1";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "src/version.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "poxml";
|
||||
module = "kdesdk";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "scripts";
|
||||
module = "kdesdk";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "strigi-analyzer";
|
||||
module = "kdesdk";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "umbrello";
|
||||
module = "kdesdk";
|
||||
version = "2.5.2"; # release - 200
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
kde.package {
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "1mjiim7r88bdsrmf6palx125ig9dn0jp6h3mw35557mx0b0qjbka";
|
||||
outputHash = "1hn65n4nznbp2ikbvyrp9ncasc6y3nxhi33x927vg01pp8frn4q1";
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
meta = {
|
||||
@ -12,7 +12,7 @@ kde.package {
|
||||
license = "GPL";
|
||||
kde = {
|
||||
name = "oxygen-icons";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,17 @@
|
||||
{ kde, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
|
||||
{ kde, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
|
||||
|
||||
kde.package {
|
||||
kde.package rec {
|
||||
buildInputs = [ cmake qt4 automoc4 ];
|
||||
propagatedBuildInputs = [ polkit glib ];
|
||||
|
||||
src = fetchurl {
|
||||
url = with meta.kde;
|
||||
"mirror://kde/stable/apps/KDE4.x/admin/${name}-${version}.tar.bz2";
|
||||
sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
|
||||
};
|
||||
|
||||
meta.kde = {
|
||||
name = "polkit-qt-1";
|
||||
version = "0.96.1";
|
||||
subdir = "apps/KDE4.x/admin";
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "amor";
|
||||
module = "kdetoys";
|
||||
version = "2.4.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "src/version.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kteatime";
|
||||
module = "kdetoys";
|
||||
version = "1.2.1";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "src/main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "ktux";
|
||||
module = "kdetoys";
|
||||
version = "1.0.1";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "src/sprite.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -14,7 +14,7 @@ kde.package {
|
||||
name = "ark";
|
||||
module = "kdeutils";
|
||||
version = "2.15";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "app/main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kcalc";
|
||||
module = "kdeutils";
|
||||
version = "2.7";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "version.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kcharselect";
|
||||
module = "kdeutils";
|
||||
version = "1.7";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "main.cc";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kdf";
|
||||
module = "kdeutils";
|
||||
version = "0.11";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "kdf.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "kfloppy";
|
||||
module = "kdeutils";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kgpg";
|
||||
module = "kdeutils";
|
||||
version = "2.4.1";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@ kde.package {
|
||||
kde = {
|
||||
name = "kremotecontrol";
|
||||
module = "kdeutils";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "ktimer";
|
||||
module = "kdeutils";
|
||||
version = "0.6";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kwallet";
|
||||
module = "kdeutils";
|
||||
version = "1.6";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "okteta";
|
||||
module = "kdeutils";
|
||||
version = "0.5.2";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "program/about.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -15,7 +15,7 @@ kde.package {
|
||||
name = "printer-applet";
|
||||
module = "kdeutils";
|
||||
version = "1.5";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "printer-applet.py";
|
||||
};
|
||||
};
|
||||
|
||||
@ -11,7 +11,7 @@ kde.package {
|
||||
name = "superkaramba";
|
||||
module = "kdeutils";
|
||||
version = "0.55";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "src/main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "sweeper";
|
||||
module = "kdeutils";
|
||||
version = "1.5";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kfilereplace";
|
||||
module = "kdewebdev";
|
||||
version = "0.1";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@ kde.package {
|
||||
name = "kimagemapeditor";
|
||||
module = "kdewebdev";
|
||||
version = "3.9.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "version.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -12,7 +12,7 @@ kde.package {
|
||||
name = "klinkstatus";
|
||||
module = "kdewebdev";
|
||||
version = "0.7.0";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "src/main.cpp";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ kde.package {
|
||||
name = "kommander";
|
||||
module = "kdewebdev";
|
||||
version = "1.91";
|
||||
release = "4.5.2";
|
||||
release = "4.5.4";
|
||||
versionFile = "lib/kommanderversion.h";
|
||||
};
|
||||
};
|
||||
|
||||
@ -47,6 +47,7 @@ rec {
|
||||
TMP=.
|
||||
TMPDIR=.
|
||||
XKB_BINDIR="${xkbcomp}/bin" Xvfb -once -reset -terminate :2 -xkbdir ${xkeyboard_config}/etc/X11/xkb &
|
||||
sleep 10;
|
||||
DISPLAY=:2 ./first_metatype_id
|
||||
'') ["doUnpack" "addInputs"];
|
||||
|
||||
|
||||
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
documentation generator (ocamldoc).
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.z77z
|
||||
];
|
||||
|
||||
@ -8,7 +8,7 @@ in
|
||||
|
||||
composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
||||
|
||||
version = "5.3.3";
|
||||
version = "5.3.4";
|
||||
|
||||
name = "php_configurable-${version}";
|
||||
|
||||
@ -151,7 +151,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
||||
|
||||
src = args.fetchurl {
|
||||
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
|
||||
sha256 = "16iz1cprpjw60nf6n5z6isdziyzj56i3r8161si58j65yd86g1zj";
|
||||
sha256 = "1391yibyc7kcrnprv6g57s2m6ld6n9j2iybzvwd2srdihl8q6cm8";
|
||||
name = "php-${version}.tar.bz2";
|
||||
};
|
||||
|
||||
|
||||
82
pkgs/development/libraries/box2d/2.0.1.nix
Normal file
82
pkgs/development/libraries/box2d/2.0.1.nix
Normal file
@ -0,0 +1,82 @@
|
||||
x@{builderDefsPackage
|
||||
, unzip, cmake, mesa, freeglut, libX11, xproto
|
||||
, inputproto, libXi
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
[];
|
||||
|
||||
buildInputs = map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="box2d";
|
||||
version="2.0.1";
|
||||
name="${baseName}-${version}";
|
||||
url="http://box2d.googlecode.com/files/Box2D_v${version}.zip";
|
||||
hash="62857048aa089b558561074154430883cee491eedd71247f75f488cba859e21f";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
src = a.fetchurl {
|
||||
url = sourceInfo.url;
|
||||
sha256 = sourceInfo.hash;
|
||||
};
|
||||
|
||||
inherit (sourceInfo) name version;
|
||||
inherit buildInputs;
|
||||
|
||||
phaseNames = ["fixIncludes" "setVars" "changeSettings" "doMake" "doDeploy"];
|
||||
|
||||
goSrcDir = ''cd Box2D'';
|
||||
|
||||
fixIncludes = a.fullDepEntry ''
|
||||
sed -i Source/Dynamics/Contacts/b2PolyContact.cpp \
|
||||
-i Source/Dynamics/Contacts/b2CircleContact.cpp \
|
||||
-i Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp \
|
||||
-i Source/Common/b2BlockAllocator.cpp \
|
||||
-i Source/Collision/b2BroadPhase.cpp \
|
||||
-i Examples/TestBed/Framework/Render.cpp \
|
||||
-i Examples/TestBed/Tests/BroadPhaseTest.cpp \
|
||||
-i Examples/TestBed/Tests/TestEntries.cpp \
|
||||
-e '1i#include <string.h>'
|
||||
'' ["minInit" "addInputs" "doUnpack"];
|
||||
|
||||
setVars = a.noDepEntry ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11 -lXi"
|
||||
'';
|
||||
|
||||
doDeploy = a.fullDepEntry ''
|
||||
ensureDir "$out"/lib
|
||||
ensureDir "$out"/include/Box2D
|
||||
cp Library/* Source/Gen/float/lib*.{a,so} "$out"/lib
|
||||
cp -r Source "$out"/include/Box2D/Source
|
||||
find "$out"/include/Box2D/Source ! -name '*.h' -exec rm '{}' ';'
|
||||
sed -e s@../Source@Box2D/Source@ -i Include/Box2D.h
|
||||
cp Include/Box2D.h "$out"/include/Box2D
|
||||
ensureDir "$out/share"
|
||||
cp -r Examples "$out/share"
|
||||
'' ["minInit" "addInputs" "doMake" "defEnsureDir"];
|
||||
|
||||
changeSettings = a.fullDepEntry ''
|
||||
sed -i Source/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices = 15;@'
|
||||
'' ["minInit" "addInputs" "doUnpack"];
|
||||
|
||||
meta = {
|
||||
description = "2D physics engine";
|
||||
maintainers = with a.lib.maintainers;
|
||||
[
|
||||
raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
license = "bsd";
|
||||
};
|
||||
passthru = {
|
||||
updateInfo = {
|
||||
downloadPage = "http://code.google.com/p/box2d/downloads/list";
|
||||
};
|
||||
};
|
||||
}) x
|
||||
|
||||
59
pkgs/development/libraries/box2d/default.nix
Normal file
59
pkgs/development/libraries/box2d/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
x@{builderDefsPackage
|
||||
, unzip, cmake, mesa, freeglut, libX11, xproto
|
||||
, inputproto, libXi
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
[];
|
||||
|
||||
buildInputs = map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="box2d";
|
||||
version="2.1.2";
|
||||
name="${baseName}-${version}";
|
||||
url="http://box2d.googlecode.com/files/Box2D_v${version}.zip";
|
||||
hash="0m5szd74ig8yqazwk2g3zl4z7wwp08k52awawk1pigy6a4z1qd9v";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
src = a.fetchurl {
|
||||
url = sourceInfo.url;
|
||||
sha256 = sourceInfo.hash;
|
||||
};
|
||||
|
||||
inherit (sourceInfo) name version;
|
||||
inherit buildInputs;
|
||||
|
||||
phaseNames = ["changeSettings" "doCmake" "doMakeInstall"];
|
||||
|
||||
changeSettings = a.fullDepEntry ''
|
||||
sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
|
||||
'' ["minInit" "addInputs" "doUnpack"];
|
||||
|
||||
goSrcDir = ''cd Box2D'';
|
||||
|
||||
doCmake = a.fullDepEntry ''
|
||||
cd Build;
|
||||
cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
|
||||
'' ["minInit" "addInputs" "doUnpack"];
|
||||
|
||||
meta = {
|
||||
description = "2D physics engine";
|
||||
maintainers = with a.lib.maintainers;
|
||||
[
|
||||
raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
license = "bsd";
|
||||
};
|
||||
passthru = {
|
||||
updateInfo = {
|
||||
downloadPage = "http://code.google.com/p/box2d/downloads/list";
|
||||
};
|
||||
};
|
||||
}) x
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{ stdenv, fetchurl, aspell, pkgconfig, glib }:
|
||||
{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "enchant-1.3.0";
|
||||
name = "${pname}-${version}";
|
||||
version = "1.6.0";
|
||||
pname = "enchant";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.abisource.com/downloads/enchant/1.3.0/${name}.tar.gz";
|
||||
sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76";
|
||||
url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
|
||||
sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g";
|
||||
};
|
||||
|
||||
buildInputs = [aspell pkgconfig glib];
|
||||
buildInputs = [aspell pkgconfig glib hunspell hspell];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.abisource.com/enchant;
|
||||
|
||||
@ -1,19 +1,22 @@
|
||||
{stdenv, fetchurl, zlib}:
|
||||
{stdenv, fetchurl, zlib, expat}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "exiv2-0.18";
|
||||
name = "exiv2-0.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.exiv2.org/${name}.tar.gz";
|
||||
sha256 = "1kg4bdlcqqhw9gcfs68i55sz4hvlf94xxxmqb255hhvhfj692rz5";
|
||||
sha256 = "1r9phzb1h9v8smw1pix2k9lyr44n4nyba15x7qh45c0pwsjdf9yq";
|
||||
};
|
||||
|
||||
buildInputs = [zlib];
|
||||
propagatedBuildInputs = [zlib expat];
|
||||
|
||||
configureFlags = "--with-zlib=${zlib} --disable-xmp";
|
||||
# configure script finds zlib&expat but it thinks that they're in /usr
|
||||
configureFlags = "--with-zlib=${zlib} --with-expat=${expat}";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.exiv2.org/;
|
||||
description = "A library and command-line utility to manage image metadata";
|
||||
maintainers = [stdenv.lib.maintainers.urkud];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, ncurses, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hunspell-1.2.11";
|
||||
name = "hunspell-1.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sf/hunspell/${name}.tar.gz";
|
||||
sha256 = "14vfs1qb01hq30ss1bsiv6lkx673695g0xdyisrq720fdq2mr5rz";
|
||||
sha256 = "0s8fh8zanhks6bgkb7dzwscy97fb6wl4ymvjqz7188fz29qjlnaz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ncurses readline ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user