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

Updating from trunk (to catch cron changes) 

svn path=/nixpkgs/branches/stdenv-updates/; revision=24200
This commit is contained in:
Lluís Batlle i Rossell 2010-10-10 11:44:28 +00:00
parent 143ea0f491 710f6c165b
commit e7e103b8eb
19 changed files with 347 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/gimp/default.nix
View File

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "gimp-2.6.10";
name = "gimp-2.6.11";
src = fetchurl {
url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
sha256 = "0cp0abdmqczncy0miazbyd61sjm63r1mhlwsvbz8lb9m7gkkyypg";
sha256 = "18dhgicc3f04q0js521kq9w3gq8yqawpf6vdb7m14f9vh380hvcv";
};
buildInputs = [

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

@ -35,19 +35,19 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
stdenv.mkDerivation rec {
name = "chrome-${version}"; # !!! Shouldn't this be "chromium"?
version = "59187";
version = "61624";
# TODO: Use a stable release that doesn't disappear every few days.
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
sha256 = "14dk0c5fgh1q2iy4srfvc6nr8grpk5k5zgnx13464bkadr9s32gx";
sha256 = "16kv1zbs3ypb2b00dpg2s4nn8zqdnv8jdvgxknp3s0xcq02w2asl";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
sha256 = "0ls2vl01psp25rhy0bjhfzjayw00rrnqmvcki8sl5kv9m581bn8s";
sha256 = "081pvwzpys98m3arj3qagyhrrphz7rjwn7yy4mk6bcrds6mwdxiz";
}
else throw "Chromium is not supported on this platform.";

141
pkgs/applications/networking/browsers/firefox/4.0.nix Normal file
View File

@ -0,0 +1,141 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, libvpx, yasm, mesa
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false
}:
rec {
firefoxVersion = "4.0b6";
xulVersion = "2.0b6"; # 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";
sha256 = "1ssgb41h43kbf012iwdybf9kp2gfqkg3icf81dg8ibwr2cd0kmz2";
};
commonConfigureFlags =
[ "--enable-optimize"
"--disable-debug"
"--enable-strip"
"--with-system-jpeg"
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
#"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
"--enable-system-cairo"
#"--enable-system-sqlite" # <-- this seems to be discouraged
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
];
xulrunner = stdenv.mkDerivation {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
# !!! Temporary hack.
preBuild = ''
export NIX_ENFORCE_PURITY=
'';
installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix some references to /bin paths in the Xulrunner shell script.
substituteInPlace $out/bin/xulrunner \
--replace /bin/pwd "$(type -tP pwd)" \
--replace /bin/ls "$(type -tP ls)"
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
mv xulrunner ../lib/$libDir/
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
ln -s $i $out/bin
fi;
done;
rm -f $out/bin/run-mozilla.sh
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-${firefoxVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
xlibs.pixman libvpx yasm mesa
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
postInstall = ''
libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
test -n "$libDir"
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
# Register extensions etc. !!! is this needed anymore?
echo "running firefox -register..."
$out/bin/firefox -register
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = {
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};
}

14
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
View File

@ -40,17 +40,17 @@ let
# http://labs.adobe.com/technologies/flashplayer10/faq.html
throw "no x86_64 debugging version available"
else {
# -> http://labs.adobe.com/downloads/flashplayer10_64bit.html
version = "10.1_p1-r091510";
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p1_64bit_linux_091510.tar.gz;
sha256 = "0dzhvnxcwfyiqvk2jn2hmdy29qclq95zd57w7bca82m8bsj1sn4b";
# -> http://labs.adobe.com/downloads/flashplayer10.html
version = "10.1_p2-r092710";
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_64bit_linux_092710.tar.gz;
sha256 = "188dn08n3rb6w3hzq4snqvip5njxdyc8k8arp8xnlqw331lfvapx";
}
else if stdenv.system == "i686-linux" then
if debug then {
# The debug version also contains a player
version = "10.1pre2-debug-121709";
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_debug_linux_121709.tar.gz;
sha256 = "162cnzn8sfdvr8mwyggsxi2bcl7zzi1nrl61bw481hhhpwnrjdx4";
version = "10.2_p2-debug-r092710";
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
} else {
version = "10.1.82.76";
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;

11
pkgs/data/misc/shared-desktop-ontologies/default.nix
View File

@ -1,15 +1,10 @@
{stdenv, fetchurl, cmake, v ? "0.2"}:
{stdenv, fetchurl, cmake}:
stdenv.mkDerivation rec {
name = "shared-desktop-ontologies-${v}";
name = "shared-desktop-ontologies-0.5";
src = fetchurl {
url = "mirror://sf/oscaf/${name}.tar.bz2";
sha256 =
if v == "0.2" then
"1w9gfprrp518hb7nm5wspxjd7xx0h08bph6asrx5vrx7j7fzg4m7"
else if v == "0.5" then
"1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r"
else throw "Unknown version";
sha256 = "1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r";
};
buildInputs = [ cmake ];
meta = with stdenv.lib; {

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

@ -133,12 +133,12 @@
kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
};
kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
kdepim = callPackage ../kde-4.4/pim { };
kdepim_runtime = callPackage ./pim-runtime { };
kdepim = callPackage ./pim { };
# Experimental 4.5 versions
kdepim_runtime45 = callPackage ./pim-runtime { };
kdepim45 = callPackage ./pim { };
kdepim_runtime45 = callPackage ./pim-runtime45 { };
kdepim45 = callPackage ./pim45 { };
### DEVELOPMENT
kdebindings = callPackage ./bindings { };

89
pkgs/desktops/kde-4.5/kde-package/manifest.nix
View File

@ -1,85 +1,5 @@
builtins.listToAttrs
[
{
name = "kdegraphics-4.5.0.tar.bz2";
value = "13ms1z26sb2pfadhagkykgnw0p7inrn36p4s9qr04qisy2b2vd6l";
}
{
name = "kdebase-workspace-4.5.0.tar.bz2";
value = "0wwg2rcwgkwi0k1a7v6h0ibvzk64mb2fvr02zbdkc94rh4pc25zw";
}
{
name = "oxygen-icons-4.5.0.tar.bz2";
value = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
}
{
name = "kdeplasma-addons-4.5.0.tar.bz2";
value = "1v0zcl65sqlz6ggin3mb6pr3gf2v15z8lyh0p4b95rslrzw6iih6";
}
{
name = "kdepimlibs-4.5.0.tar.bz2";
value = "0n3wmc2c4jcxbi81i9jmw23b5ms43gia58qpr835im874641f54m";
}
{
name = "kdegames-4.5.0.tar.bz2";
value = "1ax2qwmkpnc01prlkw5yx5hiqcv725b7yf6czr5gkjysjsqi3aqk";
}
{
name = "kdewebdev-4.5.0.tar.bz2";
value = "0frl9kfw549lfxrjbslxny12r4cg67ggnyclhb0rqma7i07g8gd8";
}
{
name = "kdelibs-4.5.0.tar.bz2";
value = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
}
{
name = "kdebase-4.5.0.tar.bz2";
value = "1znmmx84hx3a31lhr55j3h91p9r6fv1c4q9hbgv4xwaijlkxk6dw";
}
{
name = "kdeadmin-4.5.0.tar.bz2";
value = "1zwc8x1r7wg1qddw01b5zr3npmzibag17csiv4a1w6fsnvnny8k1";
}
{
name = "kdebase-runtime-4.5.0.tar.bz2";
value = "0cis9as2szqaxi0bhhw63sy6s8b994j8ffx5wsc84w4a8y3ld1s0";
}
{
name = "kdeedu-4.5.0.tar.bz2";
value = "15c6k1274ckhs4liqyxna5xka2gn4h9qfdvbh9ys85x08srb3051";
}
{
name = "kdebindings-4.5.0.tar.bz2";
value = "0x8c98gbp2rm3dckzw3l0jh2ch5g9sb2prmilwzl8d5psyhx39n6";
}
{
name = "kdemultimedia-4.5.0.tar.bz2";
value = "0b00d9kgy7jcfrxivw4gjvqzp5gd145cd4zbhbnjjdg5l9pvc721";
}
{
name = "kdetoys-4.5.0.tar.bz2";
value = "0lg12cjpk2x2qsk998jbsn0p7a26ans9zgf5966k4wmjcgx1zhqq";
}
{
name = "kdenetwork-4.5.0.tar.bz2";
value = "0xc8309z5c7k3hg38waavrs2hlpv8mf20paj9nadr8q3zs0q6nyp";
}
{
name = "kdesdk-4.5.0.tar.bz2";
value = "09w0n1v9qhxf7ijickw48s19rkaim36vnrxv28lrhj2x3s3s6n1s";
}
{
name = "kdeartwork-4.5.0.tar.bz2";
value = "15sdhrq6hx4i0wywilvvl3h8j5wfa7lgvr8siqxlipy94pfwrbwr";
}
{
name = "kdeutils-4.5.0.tar.bz2";
value = "1x4dwc193gsfcnryhkv2v3xafjr1a87ls0zfi56i1w2aj38b36l7";
}
{
name = "kdeaccessibility-4.5.0.tar.bz2";
value = "0p08xn3rdqf4a9mj4wrvnjj64mbxas3pns772a1sdmpxkyjlwwcx";
}
{
name = "polkit-qt-1-0.96.1.tar.bz2";
value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
@ -172,4 +92,11 @@ builtins.listToAttrs
name = "kdeadmin-4.5.1.tar.bz2";
value = "011ajsma8s9ay0dsjx383jn8yynkyshlzx6gjw68caxzjhpc0ib2";
}
]
{
name = "kdepim-4.4.6.tar.bz2";
value = "0pymjjxg8qjiarcbs6saxkkb4n51qlfk4l0pwblhglsvgc4q3wjm";
}
{
name = "kdepim-runtime-4.4.6.tar.bz2";
value = "1y0xxwsq9wlwbkd661i4f1iqvpzg3sbi3lq9dir45fjx406chgmd";
}]

23
pkgs/desktops/kde-4.5/pim-runtime/default.nix
View File

@ -1,15 +1,22 @@
{ kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
kde.package rec {
buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
{ kde, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
, kdelibs, kdepimlibs
, automoc4, phonon, akonadi, soprano, strigi}:
kde.package {
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/@"
'';
meta = {
description = "Runtime files for KDE PIM: akonadi agents etc.";
description = "KDE PIM runtime";
homepage = http://www.kde.org;
license = "GPL";
kde = rec {
name = "kdepim-runtime";
version = "4.4.93";
subdir = "kdepim/${version}/src/src";
stable = false;
version = "4.4.6";
subdir = "kdepim-${version}/src";
};
};
}

15
pkgs/desktops/kde-4.5/pim-runtime45/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
kde.package rec {
buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
meta = {
description = "Runtime files for KDE PIM: akonadi agents etc.";
kde = rec {
name = "kdepim-runtime";
version = "4.4.93";
subdir = "kdepim/${version}/src/src";
stable = false;
};
};
}

29
pkgs/desktops/kde-4.5/pim/default.nix
View File

@ -1,18 +1,29 @@
{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi,
shared_desktop_ontologies, soprano, grantlee, libassuan, perl, libxslt }:
{ kde, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
, automoc4, akonadi, qca2}:
kde.package {
buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi
shared_desktop_ontologies soprano grantlee libassuan perl libxslt ];
patches = [ ./boost-1.44.diff ];
buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt
shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ];
prePatch = ''
find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
'';
postInstall = ''
mkdir -p $out/nix-support/
echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
'';
meta = {
description = "KDE PIM tools";
longDescription = ''
Contains various personal information management tools for KDE, such as an organizer
'';
license = "GPL";
homepage = http://pim.kde.org;
kde = rec {
name = "kdepim";
version = "4.4.93";
subdir = "kdepim/${version}/src/src";
stable = false;
version = "4.4.6";
subdir = "kdepim-${version}/src";
};
};
}

0
pkgs/desktops/kde-4.5/pim/boost-1.44.diff → pkgs/desktops/kde-4.5/pim45/boost-1.44.diff
View File

18
pkgs/desktops/kde-4.5/pim45/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi,
shared_desktop_ontologies, soprano, grantlee, libassuan, perl, libxslt }:
kde.package {
buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi
shared_desktop_ontologies soprano grantlee libassuan perl libxslt ];
patches = [ ./boost-1.44.diff ];
meta = {
kde = rec {
name = "kdepim";
version = "4.4.93";
subdir = "kdepim/${version}/src/src";
stable = false;
};
};
}

32
pkgs/development/libraries/libpng/libpng-apng.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, zlib }:
assert zlib != null;
stdenv.mkDerivation rec {
version = "1.4.4";
name = "libpng-apng-${version}";
patch_src = fetchurl {
url = "mirror://sourceforge/project/libpng-apng/libpng-master/${version}/libpng-${version}-apng.patch.gz";
sha256 = "d729a2feacfd80547e06c30343d598302f4417cf2e6f649e4ee617690987bd24";
};
src = fetchurl {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.gz";
sha256 = "d07616ba1e9c161017384feb3b576d70c160b970abfd9549ad39a622284b574a";
};
preConfigure = ''
gunzip < ${patch_src} | patch -Np1
'';
propagatedBuildInputs = [ zlib ];
passthru = { inherit zlib; };
meta = {
description = "The official reference implementation for the PNG file format with animation patch";
homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
};
}

8
pkgs/misc/emulators/wine/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec {
version="1.3.3";
name="wine-1.3.3";
hash="1kpwcm3zqwxzwm9npipq80yfp7la6429vpg6sf4lvxc1z316wns5";
version="1.3.4";
name="wine-1.3.4";
hash="1p2zh9c3k0b2ryy8cdldcz6x7mdg0c2gkvj0hxa3bi9cczsqg4s4";
url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.3.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.4.tar.bz2";
}

47
pkgs/tools/graphics/barcode/default.nix Normal file
View File

@ -0,0 +1,47 @@
x@{builderDefsPackage
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
version="0.98";
baseName="barcode";
name="${baseName}-${version}";
# mirror://gnu/ doesn't work for this package
url="http://ftp.gnu.org/gnu/${baseName}/${name}.tar.gz";
hash="0ddn17a6hz817bchgjxrjg76v64kzl5zlll8x73ply5rg69f2aa2";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "GNU barcode generator";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
all;
};
passthru = {
updateInfo = {
downloadPage = "ftp://ftp.gnu.org/gnu/barcode/";
};
};
}) x

1
pkgs/tools/misc/rrdtool/default.nix
View File

@ -12,5 +12,6 @@ stdenv.mkDerivation {
homepage = http://oss.oetiker.ch/rrdtool/;
description = "High performance logging in Round Robin Databases";
license = "GPL";
platforms = stdenv.lib.platforms.all;
};
}

13
pkgs/tools/system/cron/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, sendmailPath ? "/usr/sbin/sendmail"}:
stdenv.mkDerivation {
name = "cron-4.1";
@ -9,10 +9,15 @@ stdenv.mkDerivation {
unpackCmd = "(mkdir cron && cd cron && sh $curSrc)";
preBuild = "
preBuild = ''
substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755
makeFlags=\"DESTROOT=$out\"
";
makeFlags="DESTROOT=$out"
# We want to ignore the $glibc/include/paths.h definition of
# sendmail path
echo "#undef _PATH_SENDMAIL" >> pathnames.h
echo '#define _PATH_SENDMAIL "${sendmailPath}"' >> pathnames.h
'';
preInstall = "ensureDir $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8";

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

@ -405,6 +405,8 @@ let
azureus = callPackage ../tools/networking/p2p/azureus { };
barcode = callPackage ../tools/graphics/barcode {};
bc = callPackage ../tools/misc/bc { };
bfr = callPackage ../tools/misc/bfr { };
@ -3399,6 +3401,7 @@ let
libpcap = callPackage ../development/libraries/libpcap { };
libpng = callPackage ../development/libraries/libpng { };
libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { };
libproxy = callPackage ../development/libraries/libproxy { };
@ -3716,7 +3719,7 @@ let
mysqlSupport = true;
};
qt4 = qt46;
qt4 = pkgs.kde4.qt4;
qt45 = callPackage ../development/libraries/qt-4.x/4.5 {
inherit (gnome) glib;
@ -5607,6 +5610,11 @@ let
inherit (gnome) libIDL;
};
firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
flac = callPackage ../applications/audio/flac { };
@ -6728,20 +6736,15 @@ let
kde4 = kde44;
kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
qt4 = pkgs.qt46;
});
kde44 = makeOverridable (import ../desktops/kde-4.4) (
applyGlobalOverrides (p: { kde4 = p.kde44; qt4 = p.qt46; }));
kde45 = callPackage ../desktops/kde-4.5 {
callPackage = newScope ({
qjson = pkgs.qjson.override { inherit (pkgs.kde45) qt4; };
pyqt4 = pkgs.pyqt4.override { inherit (pkgs.kde45) qt4; };
libdbusmenu_qt = pkgs.libdbusmenu_qt.override { inherit (pkgs.kde45) qt4; };
libktorrent = pkgs.libktorrent.override {
inherit (pkgs.kde45) qt4 kdelibs;
};
shared_desktop_ontologies = pkgs.shared_desktop_ontologies.override { v = "0.5"; };
} // pkgs.kde45);
callPackage =
let
pkgs_for_45 = (applyGlobalOverrides (p: { kde4 = p.kde45; }));
in
pkgs_for_45.newScope pkgs_for_45.kde45;
};
xfce = xfce4;

2
pkgs/top-level/release.nix
View File

@ -541,6 +541,8 @@ with (import ./release-lib.nix);
xfce4icontheme = linux;
xfce4panel = linux;
xfce4session = linux;
xfce4settings = linux;
xfceutils = linux;
xfdesktop = linux;
xfwm4 = linux;
};