MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

svn merge ^/nixpkgs/trunk

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
This commit is contained in:
Yury G. Kudryashov 2012-01-27 11:48:58 +00:00
commit 3256c40575
14 changed files with 130 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/applications/graphics/openscad/default.nix Normal file
View file

@ -0,0 +1,30 @@
{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
, mpfr, gmp
}:
stdenv.mkDerivation rec {
version = "2011.12";
name = "openscad-${version}";
src = fetchurl {
url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz";
sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh";
};
buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr];
configurePhase = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I ${eigen}/include/eigen2 "
qmake PREFIX="$out"
'';
doCheck = false;
meta = {
description = "3D parametric model compiler";
homepage = "http://openscad.org/";
platforms = with stdenv.lib.platforms;
linux;
maintainers = with stdenv.lib.maintainers;
[raskin];
};
}

4
pkgs/applications/networking/newsreaders/kwooty/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gcc, cmake, qt4, gettext
{ stdenv, fetchurl, cmake, qt4, gettext
, kdelibs, kdebase_workspace, perl
, openssl, phonon, automoc4
, libX11, libXext, libXft
@ -27,7 +27,7 @@ in stdenv.mkDerivation {
'';
buildInputs =
[ gcc perl cmake qt4 gettext automoc4 openssl
[ stdenv perl cmake qt4 gettext automoc4 openssl
kdelibs kdebase_workspace phonon
libX11 libXext libXft
];

5
pkgs/desktops/kde-4.8/default.nix
View file

@ -52,5 +52,8 @@ kde.modules // kde.individual //
full = stdenv.lib.attrValues kde.modules;
l10n = callPackage ./l10n { inherit release; };
l10n = callPackage ./l10n {
inherit release;
inherit (kde.manifest) stable;
};
}

4
pkgs/desktops/kde-4.8/l10n/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, kdelibs, gettext, release }:
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
let
@ -11,7 +11,7 @@ let
name = "kde-l10n-${saneName}-${release}";
src = fetchurl {
url = "mirror://kde/unstable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
name = "${name}.tar.bz2";
inherit sha256;
};

4
pkgs/desktops/kde-4.8/support/akonadi/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }:
stdenv.mkDerivation rec {
name = "akonadi-1.6.90";
name = "akonadi-1.7.0";
src = fetchurl {
url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
sha256 = "0a35wkrrdk4k7kw1d4rvq4w4wwlmz9vk2nb4c2yibpn9rmc6ighn";
sha256 = "105mjr6n1g6kl0djp2l8jr8b7j4s9gy2ls43g1wf3py1hf6j5fdz";
};
buildInputs = [ qt4 soprano libxslt boost ];

10
pkgs/development/compilers/sbcl/src-for-default.nix
View file

@ -1,9 +1,9 @@
rec {
version="1.0.54";
name="sbcl-1.0.54";
hash="1ip13hz5zsys3vy68y3x0fapxs87xk0gqi6bdp68vyznz2a0v1cd";
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";
version="1.0.55";
name="sbcl-1.0.55";
hash="1b87s99d000khjpg8i7bcp28mph8812axwfh64a6qarhkixnl8g3";
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2";
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2";
}

25
pkgs/development/libraries/CGAL/default.nix Normal file
View file

@ -0,0 +1,25 @@
{stdenv, fetchurl, cmake, boost, gmp, mpfr
}:
stdenv.mkDerivation rec {
version = "3.9";
name = "cgal-${version}";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/29125/CGAL-${version}.tar.gz";
sha256 = "193vjhzlf7f2kw6dbg5yw8v0izdvmnrylqzqhw92vml7jjnr8494";
};
buildInputs = [cmake boost gmp mpfr ];
doCheck = false;
meta = {
description = "Computational Geometry Algorithms Library";
homepage = "http://cgal.org/";
platforms = with stdenv.lib.platforms;
linux;
maintainers = with stdenv.lib.maintainers;
[raskin];
};
}

14
pkgs/development/libraries/glew/default.nix
View file

@ -1,16 +1,20 @@
{ stdenv, fetchurl, mesa, x11, libXmu, libXi }:
stdenv.mkDerivation {
name = "glew-1.5.2";
stdenv.mkDerivation rec {
name = "glew-1.7.0";
src = fetchurl {
url = mirror://sourceforge/glew/glew-1.5.2.tgz;
sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8";
url = "mirror://sourceforge/glew/${name}.tgz";
sha256 = "02aw6sc4v1434m7awfcxqb0v987i2ykg3fncnp21i9g1n4zsclqn";
};
buildInputs = [ mesa x11 libXmu libXi ];
installPhase = "GLEW_DEST=\$out make install";
installPhase = "
GLEW_DEST=\$out make install
mkdir -pv \$out/share/doc/glew
cp -r README.txt LICENSE.txt doc \$out/share/doc/glew
";
meta = {
description = "Cross-platform open-source C/C++ extension loading library";

6
pkgs/development/libraries/hwloc/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 }:
stdenv.mkDerivation rec {
name = "hwloc-1.3";
name = "hwloc-1.4";
src = fetchurl {
url = "http://www.open-mpi.org/software/hwloc/v1.3/downloads/${name}.tar.bz2";
sha256 = "10zlz0hng7scjx1xn8jflx3gbga5djbhxhj94k5kszrivc8zh8xy";
url = "http://www.open-mpi.org/software/hwloc/v1.4/downloads/${name}.tar.bz2";
sha256 = "1qcii99vn65jwgqpq8d2k4sksk734kkg223p58ck7v76q27h288y";
};
# XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.

6
pkgs/development/libraries/java/smack/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "smack-3_0_4";
name = "smack-3_2_1";
builder = ./builder.sh;
src = fetchurl {
url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_0_4.tar.gz;
sha256 = "075nn7vwfjr2a9j6ycikkbssxhai82vpvll9123r83rar3ds3li6";
url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_2_1.tar.gz;
sha256 = "0lljrxky66gc73caaflia2wgmlpry2cdj00bz1gd1vqrzd3pg3gd";
};
}

34
pkgs/development/libraries/opencsg/default.nix Normal file
View file

@ -0,0 +1,34 @@
{stdenv, fetchurl, mesa, freeglut, glew, libXmu, libXext, libX11
}:
stdenv.mkDerivation rec {
version = "1.3.2";
name = "opencsg-${version}";
src = fetchurl {
url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
sha256 = "09drnck27py8qg1l6gqaia85a9skqn0mz0nybjrkq4gpk0lwk467";
};
buildInputs = [mesa freeglut glew libXmu libXext libX11];
doCheck = false;
installPhase = ''
mkdir -pv "$out/"{bin,share/doc/opencsg}
cp example/opencsgexample "$out/bin"
cp -r include lib "$out"
cp license.txt "$out/share/doc/opencsg"
'';
meta = {
description = "Constructive Solid Geometry library";
homepage = "http://www.opencsg.org/";
platforms = with stdenv.lib.platforms;
linux;
maintainers = with stdenv.lib.maintainers;
[raskin];
};
}

4
pkgs/os-specific/linux/bluez/default.nix
View file

@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation rec {
name = "bluez-4.96";
name = "bluez-4.98";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
sha256 = "16gshw7xgl0k3j3qgkdqmgvzqz6fdcna909ibvawl2brsw7xavy0";
sha256 = "9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233";
};
buildInputs =

4
pkgs/os-specific/linux/kernel/linux-3.2.nix
View file

@ -214,7 +214,7 @@ in
import ./generic.nix (
rec {
version = "3.2.1";
version = "3.2.2";
testing = false;
modDirVersion = version;
@ -225,7 +225,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2";
sha256 = "0kplzd61zblbsqzhggwk5lca0diqd8crhrd7d7jd6gc8jcyiwavy";
sha256 = "9f20bd2332db32e2d5b0fc346762d486faab19e0dd059c82964116421bb7cceb";
};
config = configWithPlatform stdenv.platform;

8
pkgs/top-level/all-packages.nix
View file

@ -3243,6 +3243,8 @@ let
celt = callPackage ../development/libraries/celt {};
celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};
cgal = callPackage ../development/libraries/CGAL {};
cgui = callPackage ../development/libraries/cgui {};
check = callPackage ../development/libraries/check { };
@ -4397,6 +4399,8 @@ let
opencascade = callPackage ../development/libraries/opencascade { };
opencsg = callPackage ../development/libraries/opencsg { };
openct = callPackage ../development/libraries/openct { };
opencv = callPackage ../development/libraries/opencv {
@ -5935,7 +5939,7 @@ let
linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor linux_3_2 pkgs.linuxPackages_3_2);
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2);
linuxPackages_3_2_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_2_powertop pkgs.linuxPackages_3_2_powertop);
# The current default kernel / kernel modules.
@ -7291,6 +7295,8 @@ let
neon = neon029;
};
openscad = callPackage ../applications/graphics/openscad {};
opera = callPackage ../applications/networking/browsers/opera {
inherit (pkgs.gtkLibs) gdk_pixbuf atk;
inherit (pkgs.kde4) kdelibs;