Author: kkallio
Date: Sun Aug 7 00:38:11 2011
New Revision: 28213
URL: https://svn.nixos.org/websvn/nix/?rev=28213&sc=1
Log:
First few programs of kde 4.7 kdeedu.
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/klettres.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/kmplot.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/kstars.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/rocs.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/step.nix
Deleted:
nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/default.nix
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
nixpkgs/trunk/pkgs/development/libraries/boost/default.nix
nixpkgs/trunk/pkgs/development/libraries/indilib/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Sun Aug 7 00:37:49
2011 (r28212)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Sun Aug 7 00:38:11
2011 (r28213)
@@ -1,4 +1,4 @@
-{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47,
system_config_printer } @ args:
+{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47,
system_config_printer, boost } @ args:
let
@@ -106,11 +106,20 @@
/*
kdeedu = callPackage ./edu { };
- kdegraphics = callPackage ./graphics { };
kdenetwork = callPackage ./network { };
kdeplasma_addons = callPackage ./plasma-addons { };
*/
+ kdeedu = combinePkgs "kdeedu" {
+ klettres = callPackage ./edu/klettres.nix { };
+ kmplot = callPackage ./edu/kmplot.nix { };
+ kstars = callPackage ./edu/kstars.nix { };
+ rocs = callPackage ./edu/rocs.nix {
+ boost = args.boost.override {enableExceptions = true;};
+ };
+ step = callPackage ./edu/step.nix { };
+ };
+
kdegraphics = combinePkgs "kdegraphics" {
gwenview = callPackage ./graphics/gwenview.nix { };
kamera = callPackage ./graphics/kamera.nix { };
Added: nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/klettres.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/klettres.nix Sun Aug 7
00:38:11 2011 (r28213)
@@ -0,0 +1,12 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
+
+kde.package {
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+
+ meta = {
+ description = "A KDE alphabet tutorial";
+ kde = {
+ name = "klettres";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/kmplot.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/kmplot.nix Sun Aug 7 00:38:11
2011 (r28213)
@@ -0,0 +1,12 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
+
+kde.package {
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+
+ meta = {
+ description = "A KDE mathematical function plotter";
+ kde = {
+ name = "kmplot";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/kstars.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/kstars.nix Sun Aug 7 00:38:11
2011 (r28213)
@@ -0,0 +1,12 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, eigen, xplanet, indilib }:
+
+kde.package {
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon eigen xplanet indilib ];
+
+ meta = {
+ description = "A KDE graphical desktop planetarium";
+ kde = {
+ name = "kstars";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/rocs.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/rocs.nix Sun Aug 7 00:38:11
2011 (r28213)
@@ -0,0 +1,14 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, boost, perl }:
+
+kde.package {
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon boost perl ];
+
+ NIX_CFLAGS_COMPILE = "-fexceptions";
+
+ meta = {
+ description = "A KDE graph theory viewer";
+ kde = {
+ name = "rocs";
+ };
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/step.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/edu/step.nix Sun Aug 7 00:38:11
2011 (r28213)
@@ -0,0 +1,12 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, gsl, libqalculate, eigen }:
+
+kde.package {
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon gsl libqalculate eigen ];
+
+ meta = {
+ description = "A KDE interactive physical simulator";
+ kde = {
+ name = "step";
+ };
+ };
+}
Modified: nixpkgs/trunk/pkgs/development/libraries/boost/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/boost/default.nix Sun Aug 7
00:37:49 2011 (r28212)
+++ nixpkgs/trunk/pkgs/development/libraries/boost/default.nix Sun Aug 7
00:38:11 2011 (r28213)
@@ -6,6 +6,7 @@
, enableShared ? true
, enableStatic ? false
, enablePIC ? false
+, enableExceptions ? false
}:
let
@@ -28,8 +29,14 @@
(enableShared && enableStatic)) then
"tagged" else "system";
- cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
else "";
-
+ cflags = if (enablePIC && enableExceptions) then
+ "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
+ else if (enablePIC) then
+ "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
+ else if (enableExceptions) then
+ "cflags=-fexceptions"
+ else
+ "";
in
stdenv.mkDerivation {
Modified: nixpkgs/trunk/pkgs/development/libraries/indilib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/indilib/default.nix Sun Aug
7 00:37:49 2011 (r28212)
+++ nixpkgs/trunk/pkgs/development/libraries/indilib/default.nix Sun Aug
7 00:38:11 2011 (r28213)
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, cfitsio, libusb, zlib }:
+{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost }:
stdenv.mkDerivation {
- name = "indilib-0.5";
+ name = "indilib-0.8";
src = fetchurl {
- url = mirror://sf/indi/indilib-0.5.tar.gz;
- sha256 = "02km37m3d2l8c9wnab24zm2k6a3l8h2fali74jhm4z3khwr277ad";
+ url = mirror://sf/indi/libindi_0.8.tar.gz;
+ sha256 =
"d5ed14a5de6fd6e5db15463ada96c2b15b53e84a1ffe199b76f70128493f2a65";
};
- propagatedBuildInputs = [ cfitsio libusb zlib ];
+ propagatedBuildInputs = [ cmake cfitsio libusb zlib boost ];
meta = {
homepage = http://indi.sf.net;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
