mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 12:53:59 +03:00
* Sync with trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26243
This commit is contained in:
Eelco Dolstra
commit
cc3d1e1c09
@ -2,11 +2,11 @@
|
||||
, libXinerama }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "feh-1.6.1";
|
||||
name = "feh-1.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.chaosdorf.de/~derf/feh/feh-1.6.1.tar.bz2;
|
||||
sha256 = "1mv09b34ar0dx4wl22xak2g554xgpylicqy5zbnk3bh66vn9pxz2";
|
||||
url = http://www.chaosdorf.de/~derf/feh/feh-1.11.1.tar.bz2;
|
||||
sha256 = "1rxi0hjp8w1rga48qvq3sgsbsgs4d5q1sq59ld1f7rih1knm2v45";
|
||||
};
|
||||
|
||||
buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama];
|
||||
|
||||
@ -1,29 +1,25 @@
|
||||
{ spellChecking ? true
|
||||
, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null
|
||||
, perl, pcre, gmime, gettext
|
||||
, perl, pcre, gmime, gettext, intltool
|
||||
}:
|
||||
|
||||
assert spellChecking -> gtkspell != null;
|
||||
|
||||
let version = "0.134"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pan-0.133";
|
||||
name = "pan-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://pan.rebelbase.com/download/releases/0.133/source/pan-0.133.tar.bz2;
|
||||
sha1 = "a0bd98ea1ba174800896611e3305a6b6d8dbde2f";
|
||||
url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
|
||||
sha1 = "7ef9385e59edf7d511ad3de6c39482297c820685";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ # Build on GCC 4.4.
|
||||
(fetchurl {
|
||||
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-nntp/pan/files/pan-0.133-gcc44.patch?rev=1.1";
|
||||
sha256 = "05xmgvcpl1gjcfab8xsdy400p55j59hp52fwa4qbwlqy3c35qv1v";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [pkgconfig gtk perl pcre gmime gettext]
|
||||
buildInputs = [ pkgconfig gtk perl gmime gettext intltool ]
|
||||
++ stdenv.lib.optional spellChecking gtkspell;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A GTK+-based Usenet newsreader good at both text and binaries";
|
||||
homepage = http://pan.rebelbase.com/;
|
||||
|
||||
40
pkgs/applications/window-managers/awesome/cmake284.patch
Normal file
40
pkgs/applications/window-managers/awesome/cmake284.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Moschny <thomas.moschny@gmx.de>
|
||||
Date: Mon, 21 Feb 2011 17:58:04 +0100
|
||||
Subject: [PATCH] Normalize icon path names (fixes #869).
|
||||
|
||||
The elements in ${icon_sources}, as returned by file(GLOB ...) contain
|
||||
double slashes, could be a bug in cmake. This causes building with
|
||||
cmake 2.8.4 to fail, due to dependency problems lateron.
|
||||
|
||||
This patch works around the issue by normalizing all path names in
|
||||
${icon_sources} while appending them to ${ALL_ICONS}, thereby removing
|
||||
the double slashes.
|
||||
---
|
||||
CMakeLists.txt | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 64be9b9..472bec2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -244,14 +244,15 @@ endif()
|
||||
|
||||
# {{{ Theme icons
|
||||
file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
|
||||
-set(ALL_ICONS ${icon_sources})
|
||||
|
||||
foreach(icon ${icon_sources})
|
||||
# Copy all icons to the build dir to simplify the following code.
|
||||
# Source paths are interpreted relative to ${SOURCE_DIR}, target paths
|
||||
# relative to ${BUILD_DIR}.
|
||||
get_filename_component(icon_path ${icon} PATH)
|
||||
+ get_filename_component(icon_name ${icon} NAME)
|
||||
file(COPY ${icon} DESTINATION ${icon_path})
|
||||
+ set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
|
||||
endforeach()
|
||||
|
||||
macro(a_icon_convert match replacement input)
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -22,13 +22,15 @@ stdenv.mkDerivation rec {
|
||||
# We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
|
||||
# the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as
|
||||
# dependencies.
|
||||
patchPhase = ''
|
||||
prePatch = ''
|
||||
# Fix the tab completion (supporting bash or zsh)
|
||||
sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
|
||||
# Remove the 'root' PATH override (I don't know why they have that)
|
||||
sed /WHOAMI/d -i utils/awsetbg
|
||||
'';
|
||||
|
||||
patches = [ ./cmake284.patch ];
|
||||
|
||||
# Somehow libev does not get into the rpath, although it should.
|
||||
# Something may be wrong in the gcc wrapper.
|
||||
preBuild = ''
|
||||
@ -42,5 +44,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://awesome.naquadah.org/;
|
||||
description = "Highly configurable, dynamic window manager for X";
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
45
pkgs/development/compilers/ghc/7.0.2.nix
Normal file
45
pkgs/development/compilers/ghc/7.0.2.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.0.2";
|
||||
|
||||
name = "ghc-${version}";
|
||||
|
||||
# TODO: Does this have to be here, or can it go to meta?
|
||||
homepage = "http://haskell.org/ghc";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
|
||||
sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
|
||||
};
|
||||
|
||||
buildInputs = [ghc perl gmp ncurses];
|
||||
|
||||
buildMK = ''
|
||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
echo "${buildMK}" > mk/build.mk
|
||||
'';
|
||||
|
||||
configureFlags=[
|
||||
"--with-gcc=${stdenv.gcc}/bin/gcc"
|
||||
];
|
||||
|
||||
# required, because otherwise all symbols from HSffi.o are stripped, and
|
||||
# that in turn causes GHCi to abort
|
||||
stripDebugFlags=["-S" "--keep-file-symbols"];
|
||||
|
||||
meta = {
|
||||
inherit homepage;
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
25
pkgs/development/libraries/cminpack/default.nix
Normal file
25
pkgs/development/libraries/cminpack/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cminpack-1.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://devernay.free.fr/hacks/cminpack/cminpack-1.1.2.tar.gz;
|
||||
sha256 = "0sd8gqk7npyiiiz2jym8q89d9gqx8fig0mnx63swkwmp4lqmmxww";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i s,/usr/local,$out, Makefile
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
ensureDir $out/lib $out/include
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://devernay.free.fr/hacks/cminpack/cminpack.html;
|
||||
license = "BSD";
|
||||
description = "Software for solving nonlinear equations and nonlinear least squares problems";
|
||||
};
|
||||
|
||||
}
|
||||
18
pkgs/development/libraries/flann/default.nix
Normal file
18
pkgs/development/libraries/flann/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{stdenv, fetchurl, unzip, cmake, python}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "flann-1.6.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.6.8-src.zip;
|
||||
sha256 = "0ag9k821jy0983gjrfsjnqkl5axklcih0qkpfy72h3643nin0f50";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip cmake python ];
|
||||
|
||||
meta = {
|
||||
homepage = http://people.cs.ubc.ca/~mariusm/flann/;
|
||||
license = "BSD";
|
||||
description = "Fast approximate nearest neighbor searches in high dimensional spaces";
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gmime-2.2.26";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gmime/2.2/${name}.tar.gz";
|
||||
sha256 = "16inhq6symym9n71kxcndjwrxs2xrz63idvy64yc486wlg54aqfc";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib zlib ];
|
||||
|
||||
meta = {
|
||||
homepage = http://spruce.sourceforge.net/gmime/;
|
||||
description = "A C/C++ library for manipulating MIME messages";
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, perl, gdb, autoconf, automake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "valgrind-3.6.0";
|
||||
name = "valgrind-3.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://valgrind.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "0pr8h0q909z15g2i2jrcryhqbshair42rylf3mprhyx4nm9h23xw";
|
||||
sha256 = "03kaf8q49r347diryc2p1q5hxsd6hyhxikqdbydh8q7hpi7wrga9";
|
||||
};
|
||||
|
||||
# Perl is needed for `cg_annotate'.
|
||||
|
||||
@ -34,10 +34,10 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hydra-${version}";
|
||||
version = "0.1pre25566";
|
||||
version = "0.1pre26202";
|
||||
src = fetchurl {
|
||||
url = http://hydra.nixos.org/build/858318/download/1/hydra-0.1pre25566.tar.gz;
|
||||
sha256 = "6b2dc48d609a69dec117debbd185d71bfb092bc7078f8ca59e29aaf3c9591ca7";
|
||||
url = http://hydra.nixos.org/build/956221/download/2/hydra-0.1pre26202.tar.gz;
|
||||
sha256 = "0v727al406akn9n9ys5kl77kagr5l8yq9zi4nnn9nrcii8pavb99";
|
||||
};
|
||||
|
||||
configureFlags = "--with-nix=${nix}";
|
||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
rpm dpkg cdrkit]));
|
||||
|
||||
postInstall = ''
|
||||
for i in $out/bin/*; do
|
||||
for i in "$out/bin/"*; do
|
||||
wrapProgram $i \
|
||||
--prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
|
||||
--prefix PATH ':' $out/bin:$hydraPath \
|
||||
@ -58,10 +58,12 @@ stdenv.mkDerivation rec {
|
||||
--set HYDRA_HOME $out/libexec/hydra \
|
||||
--set NIX_RELEASE ${nix.name}
|
||||
done
|
||||
''; # */
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Hydra, the Nix-based continuous integration system";
|
||||
homepage = http://nixos.org/hydra/;
|
||||
license = "GPLv3+";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -198,11 +198,11 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "2.6.32.31";
|
||||
version = "2.6.32.32";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-${version}.tar.bz2";
|
||||
sha256 = "1fr0by6aqv9vxglll85kbwjwfj2j6inbikybij3mg70sadq09idh";
|
||||
sha256 = "0mrs135d660zwg3a04p9z6lm0znxxjm8waz7gxlghrn5h49rfqpl";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -1,20 +1,25 @@
|
||||
{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }:
|
||||
{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu
|
||||
, EFIsupport ? false }:
|
||||
|
||||
let unifont_bdf = fetchurl {
|
||||
let
|
||||
prefix = "grub${if EFIsupport then "-efi" else ""}";
|
||||
version = "1.99rc1";
|
||||
unifont_bdf = fetchurl {
|
||||
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
|
||||
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "grub-1.98";
|
||||
name = "${prefix}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";
|
||||
sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy";
|
||||
url = "ftp://alpha.gnu.org/gnu/grub/grub-1.99~rc1.tar.gz";
|
||||
sha256 = "0llxycgrs5h9n2mlgmkkg1mr2fv1rzmlw4mqb3v9hcaydkx3wczh";
|
||||
name = "${name}.tar.gz";
|
||||
};
|
||||
|
||||
buildInputs = [ bison ncurses libusb freetype gettext ]
|
||||
buildInputs = [ flex bison ncurses libusb freetype gettext ]
|
||||
++ stdenv.lib.optional doCheck qemu;
|
||||
|
||||
preConfigure =
|
||||
@ -36,22 +41,20 @@ stdenv.mkDerivation rec {
|
||||
-e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
|
||||
'';
|
||||
|
||||
patches =
|
||||
[ # The udev rules for LVM create symlinks in /dev/mapper rathe
|
||||
# than device nodes, causing GRUB to fail to recognize LVM
|
||||
# volumes. See
|
||||
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704
|
||||
# This ugly workaround makes `find_root_device' use stat() on
|
||||
# files in /dev/mapper instead of lstat().
|
||||
./device-mapper-symlinks.patch
|
||||
];
|
||||
|
||||
postPatch =
|
||||
prePatch =
|
||||
'' gunzip < "${unifont_bdf}" > "unifont.bdf"
|
||||
sed -i "configure" \
|
||||
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
let arch = if stdenv.system == "i686-linux" then "i386"
|
||||
else if stdenv.system == "x86_64-linux" then "x86_64"
|
||||
else throw "unsupported EFI firmware architecture";
|
||||
in
|
||||
stdenv.lib.optionals EFIsupport
|
||||
[ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
Only in grub-1.97.1-orig/: grub-1.97.1
|
||||
diff -rc -x '*~' grub-1.97.1-orig/util/getroot.c grub-1.97.1/util/getroot.c
|
||||
*** grub-1.97.1-orig/util/getroot.c 2009-11-09 16:48:16.000000000 +0100
|
||||
--- grub-1.97.1/util/getroot.c 2010-01-08 00:26:12.000000000 +0100
|
||||
***************
|
||||
*** 217,224 ****
|
||||
continue;
|
||||
|
||||
if (S_ISLNK (st.st_mode))
|
||||
! /* Don't follow symbolic links. */
|
||||
! continue;
|
||||
|
||||
if (S_ISDIR (st.st_mode))
|
||||
{
|
||||
--- 217,229 ----
|
||||
continue;
|
||||
|
||||
if (S_ISLNK (st.st_mode))
|
||||
! {
|
||||
! if (strcmp(dir, "mapper") != 0)
|
||||
! /* Don't follow symbolic links. */
|
||||
! continue;
|
||||
! if (stat (ent->d_name, &st) < 0)
|
||||
! continue;
|
||||
! }
|
||||
|
||||
if (S_ISDIR (st.st_mode))
|
||||
{
|
||||
@ -740,6 +740,7 @@ let
|
||||
};
|
||||
|
||||
grub2 = callPackage ../tools/misc/grub/1.9x.nix { };
|
||||
grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };
|
||||
|
||||
gssdp = callPackage ../development/libraries/gssdp {
|
||||
inherit (gnome) libsoup;
|
||||
@ -1972,9 +1973,14 @@ let
|
||||
haskellPackages_ghc6123 =
|
||||
haskellPackagesFun ../development/compilers/ghc/6.12.3.nix false (x : x);
|
||||
|
||||
# Will never make it into a platform release, severe bugs; leave at lowPrio.
|
||||
haskellPackages_ghc701 =
|
||||
haskellPackagesFun ../development/compilers/ghc/7.0.1.nix false lowPrio;
|
||||
|
||||
# Will hopefully become new default once Haskell Platform 2011 is released.
|
||||
haskellPackages_ghc702 =
|
||||
haskellPackagesFun ../development/compilers/ghc/7.0.2.nix false lowPrio;
|
||||
|
||||
haskellPackages_ghcHEAD =
|
||||
haskellPackagesFun ../development/compilers/ghc/head.nix false lowPrio;
|
||||
|
||||
@ -2871,6 +2877,8 @@ let
|
||||
inherit (gnome) gtk;
|
||||
};
|
||||
|
||||
cminpack = callPackage ../development/libraries/cminpack { };
|
||||
|
||||
coin3d = callPackage ../development/libraries/coin3d { };
|
||||
|
||||
commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
|
||||
@ -2972,6 +2980,8 @@ let
|
||||
singlePrecision = true;
|
||||
};
|
||||
|
||||
flann = callPackage ../development/libraries/flann { };
|
||||
|
||||
fltk11 = callPackage ../development/libraries/fltk/fltk11.nix { };
|
||||
|
||||
fltk20 = callPackage ../development/libraries/fltk { };
|
||||
@ -3141,8 +3151,6 @@ let
|
||||
|
||||
gmime = callPackage ../development/libraries/gmime { };
|
||||
|
||||
gmime_2_2 = callPackage ../development/libraries/gmime/2.2.x.nix { };
|
||||
|
||||
gmm = callPackage ../development/libraries/gmm { };
|
||||
|
||||
gmp =
|
||||
@ -6482,7 +6490,6 @@ let
|
||||
};
|
||||
|
||||
pan = callPackage ../applications/networking/newsreaders/pan {
|
||||
gmime = gmime_2_2;
|
||||
spellChecking = false;
|
||||
};
|
||||
|
||||
|
||||
@ -398,14 +398,6 @@ with (import ./release-lib.nix);
|
||||
gtk = linux;
|
||||
};
|
||||
|
||||
haskellPackages_ghc6102 = {
|
||||
ghc = ghcSupported;
|
||||
};
|
||||
|
||||
haskellPackages_ghc6103 = {
|
||||
ghc = ghcSupported;
|
||||
};
|
||||
|
||||
haskellPackages_ghc6104 = {
|
||||
ghc = ghcSupported;
|
||||
gtk2hs = linux;
|
||||
@ -419,12 +411,6 @@ with (import ./release-lib.nix);
|
||||
haskellPlatform_2010_1_0_0 = ghcSupported;
|
||||
};
|
||||
|
||||
haskellPackages_ghc6122 = {
|
||||
darcs = ghcSupported;
|
||||
ghc = ghcSupported;
|
||||
haskellPlatform_2010_1_0_0 = ghcSupported;
|
||||
};
|
||||
|
||||
haskellPackages_ghc6123 = {
|
||||
darcs = ghcSupported;
|
||||
ghc = ghcSupported;
|
||||
@ -440,6 +426,10 @@ with (import ./release-lib.nix);
|
||||
ghc = ghcSupported;
|
||||
};
|
||||
|
||||
haskellPackages_ghc702 = {
|
||||
ghc = ghcSupported;
|
||||
};
|
||||
|
||||
kde3 = {
|
||||
kdebase = linux;
|
||||
kdelibs = linux;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user