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

Merge pull request #155 from bbenoist/newpkgs

Browse Source 
New pkgs: qtcreator fox xfe gmrun geany
This commit is contained in:
Peter Simons 2012-11-20 12:43:06 -08:00
commit 2f55f31f49
10 changed files with 344 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/applications/editors/geany/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool }:
let
version = "1.22";
in
stdenv.mkDerivation rec {
name = "geany-${version}";
src = fetchurl {
url = "http://download.geany.org/${name}.tar.gz";
md5 = "1cb7f6cea8e301c416211786cec474fa";
};
buildInputs = [ gtk2 which pkgconfig intltool ];
doCheck = true;
enableParallelBuilding = true;
meta = {
description = "A GTK2 small and ligthweight IDE.";
longDescription = ''
Geany is a small and lightweight Integrated Development Environment.
It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME.
Geany only requires the GTK2 runtime libraries.
Some basic features of Geany:
- Syntax highlighting
- Code folding
- Symbol name auto-completion
- Construct completion/snippets
- Auto-closing of XML and HTML tags
- Call tips
- Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list)
- Symbol lists
- Code navigation
- Build system to compile and execute your code
- Simple project management
- Plugin interface
'';
homepage = "http://www.geany.org/";
license = "GPL";
maintainers = [ stdenv.lib.maintainers.bbenoist ];
platforms = stdenv.lib.platforms.all;
};
}

39
pkgs/applications/misc/gmrun/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ stdenv, fetchurl, glib, gtk2, pkgconfig, popt }:
let
version = "0.9.2";
in
stdenv.mkDerivation rec {
name = "gmrun-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/gmrun/gmrun/${version}/${name}.tar.gz";
md5 = "6cef37a968006d9496fc56a7099c603c";
};
buildInputs = [ glib gtk2 pkgconfig popt ];
doCheck = true;
enableParallelBuilding = true;
patches = [
./gcc43.patch
./gmrun-0.9.2-xdg.patch
];
meta = {
description = "Gnome Completion-Run Utility.";
longDescription = ''
A simple program which provides a "run program" window, featuring a bash-like TAB completion.
It uses GTK+ interface.
Also, supports CTRL-R / CTRL-S / "!" for searching through history.
Running commands in a terminal with CTRL-Enter. URL handlers.
'';
homepage = "http://sourceforge.net/projects/gmrun/";
license = "GPL";
maintainers = [ stdenv.lib.maintainers.bbenoist ];
platforms = stdenv.lib.platforms.all;
};
}

51
pkgs/applications/misc/gmrun/gcc43.patch Normal file
View File

@ -0,0 +1,51 @@
--- a/src/gtkcompletionline.cc.orig 2003-11-16 11:55:07.000000000 +0100
+++ a/src/gtkcompletionline.cc 2008-05-08 08:51:22.000000000 +0200
@@ -29,6 +29,7 @@
#include <set>
#include <sstream>
#include <string>
+#include <cstring>
#include <vector>
using namespace std;
--- a/src/ci_string.h.orig 2001-05-16 16:39:31.000000000 +0200
+++ a/src/ci_string.h 2008-05-08 08:51:33.000000000 +0200
@@ -7,6 +7,7 @@
#define __CI_STRING_H__
#include <string>
+#include <cstring>
#include <ctype.h>
struct ci_char_traits : public std::char_traits<char>
--- a/src/prefs.cc.orig 2002-08-16 12:48:22.000000000 +0200
+++ a/src/prefs.cc 2008-05-08 08:51:54.000000000 +0200
@@ -13,6 +13,7 @@
#include <fstream>
#include <iostream>
#include <stdio.h>
+#include <stdlib.h>
#include <list>
--- a/src/main.cc.orig 2003-11-16 11:55:07.000000000 +0100
+++ a/src/main.cc 2008-05-08 09:03:11.000000000 +0200
@@ -14,6 +14,7 @@
#include <gdk/gdkkeysyms.h>
#include <string>
+#include <cstring>
#include <iostream>
#include <sstream>
#include <vector>
--- a/src/gtkcompletionline.cc.orig 2009-06-19 22:38:14.000000000 +0400
+++ a/src/gtkcompletionline.cc 2009-06-19 22:37:14.000000000 +0400
@@ -376,7 +377,7 @@
return 0;
}
-int my_alphasort(const void* va, const void* vb) {
+int my_alphasort(const dirent** va, const dirent** vb) {
const struct dirent** a = (const struct dirent**)va;
const struct dirent** b = (const struct dirent**)vb;

58
pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch Normal file
View File

@ -0,0 +1,58 @@
diff -ur a/src/history.cc src/history.cc
--- a/src/history.cc 2002-08-17 15:19:31.000000000 +0200
+++ a/src/history.cc 2012-06-04 23:42:35.314653414 +0200
@@ -24,8 +24,15 @@
HistoryFile::HistoryFile()
{
m_file_entries = 0;
- m_filename = g_get_home_dir();
- m_filename += "/.gmrun_history";
+ const char* filename = getenv("XDG_CACHE_HOME");
+ if (filename != 0 && *filename != '\0') {
+ m_filename = filename;
+ m_filename += "/gmrun_history";
+ }
+ else {
+ m_filename = g_get_home_dir();
+ m_filename += "/.gmrun_history";
+ }
m_current = 0;
m_default_set = false;
read_the_file();
diff -ur a/src/prefs.cc src/prefs.cc
--- a/src/prefs.cc 2012-06-04 22:35:00.671949439 +0200
+++ a/src/prefs.cc 2012-06-04 23:24:24.184445962 +0200
@@ -35,12 +35,29 @@
file_name += GMRUNRC;
init(file_name);
- file_name = getenv("HOME");
- if (!file_name.empty()) {
+ file_name.clear();
+ const char* filename = getenv("XDG_CONFIG_HOME");
+ if (filename != 0 && *filename != '\0') {
+ file_name = filename;
string::iterator i = file_name.end() - 1;
- if (*i == '/') file_name.erase(i);
- file_name += "/.";
+ if (*i != '/') {
+ file_name += '/';
+ }
file_name += GMRUNRC;
+ }
+ else {
+ filename = getenv("HOME");
+ if (filename != 0 && *filename != '\0') {
+ file_name = filename;
+ string::iterator i = file_name.end() - 1;
+ if (*i != '/') {
+ file_name += '/';
+ }
+ file_name += '.';
+ file_name += GMRUNRC;
+ }
+ }
+ if (!file_name.empty()) {
init(file_name);
}
}

33
pkgs/applications/misc/xfe/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, fetchurl, fox_1_6, pkgconfig, gettext, x11, gcc, intltool, file, libpng }:
let
version = "1.33";
in
stdenv.mkDerivation rec {
name = "xfe-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/xfe/xfe/${version}/${name}.tar.gz";
md5 = "fb089ba73add411b08a6560eeb51742d";
};
buildInputs = [ fox_1_6 pkgconfig gettext x11 gcc intltool file libpng ];
doCheck = false;
enableParallelBuilding = true;
meta = {
description = "X File Explorer (Xfe) is an MS-Explorer like file manager for X.";
longDescription = ''
X File Explorer (Xfe) is an MS-Explorer like file manager for X.
It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov.
Xfe aims to be the filemanager of choice for all the Unix addicts!
'';
homepage = "http://sourceforge.net/projects/xfe/";
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.bbenoist ];
platforms = stdenv.lib.platforms.all;
};
}

34
pkgs/development/libraries/fox/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, fetchurl, x11 }:
let
version = "1.7.9";
in
stdenv.mkDerivation rec {
name = "fox-${version}";
src = fetchurl {
url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
md5 = "b5897e9c664967f5042e57070037ff18";
};
buildInputs = [ x11 ];
doCheck = true;
enableParallelBuilding = true;
meta = {
description = "FOX is a C++ based class library for building Graphical User Interfaces";
longDescription = ''
FOX stands for Free Objects for X.
It is a C++ based class library for building Graphical User Interfaces.
Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
'';
homepage = "http://fox-toolkit.org";
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.bbenoist ];
platforms = stdenv.lib.platforms.all;
};
}

34
pkgs/development/libraries/fox/fox-1.6.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, fetchurl, x11 }:
let
version = "1.6.9";
in
stdenv.mkDerivation rec {
name = "fox-${version}";
src = fetchurl {
url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
md5 = "8ab8274237431865f57b2f5596374a65";
};
buildInputs = [ x11 ];
doCheck = true;
enableParallelBuilding = true;
meta = {
description = "FOX is a C++ based class library for building Graphical User Interfaces";
longDescription = ''
FOX stands for Free Objects for X.
It is a C++ based class library for building Graphical User Interfaces.
Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
'';
homepage = "http://fox-toolkit.org";
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.bbenoist ];
platforms = stdenv.lib.platforms.all;
};
}

36
pkgs/development/qtcreator/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv, fetchurl, qt4 }:
let
version = "2.5.2";
in
stdenv.mkDerivation rec {
name = "qtcreator-${version}";
src = fetchurl {
url = "http://origin.releases.qt-project.org/qtcreator/${version}/qt-creator-${version}-src.tar.gz";
md5 = "4a9c09cdf4609753283c31451c84ceb8";
};
buildInputs = [ qt4 ];
doCheck = false;
enableParallelBuilding = true;
preConfigure = "qmake";
installFlags = "INSTALL_ROOT=$(out)";
meta = {
description = "Qt Creator is a cross-platform IDE tailored to the needs of Qt developers.";
longDescription = ''
Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers.
It includes features such as an advanced code editor, a visual debugger and a GUI designer.
'';
homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator";
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.bbenoist ];
platforms = stdenv.lib.platforms.all;
};
}

1
pkgs/lib/maintainers.nix
View File

@ -10,6 +10,7 @@
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
antono = "Antono Vasiljev <self@antono.info>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
bbenoist = "Baptist BENOIST <return_0@live.com>";
bjg = "Brian Gough <bjg@gnu.org>";
bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
chaoflow = "Florian Friesdorf <flo@chaoflow.net>";

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

@ -739,6 +739,9 @@ let
fortune = callPackage ../tools/misc/fortune { };
fox = callPackage ../development/libraries/fox/default.nix { };
fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { };
fprot = callPackage ../tools/security/fprot { };
freeipmi = callPackage ../tools/system/freeipmi {};
@ -6966,6 +6969,8 @@ let
fossil = callPackage ../applications/version-management/fossil { };
geany = callPackage ../applications/editors/geany { };
goldendict = callPackage ../applications/misc/goldendict { };
grass = import ../applications/misc/grass {
@ -7087,6 +7092,8 @@ let
pcre = pcre.override { unicodeSupport = true; };
};
gmrun = callPackage ../applications/misc/gmrun {};
gnucash = callPackage ../applications/office/gnucash {
inherit (gnome) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint;
gconf = gnome.GConf;
@ -7648,6 +7655,8 @@ let
qsynth = callPackage ../applications/audio/qsynth { };
qtcreator = callPackage ../development/qtcreator { };
qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };
qtractor = callPackage ../applications/audio/qtractor { };
@ -8029,6 +8038,8 @@ let
xen = callPackage ../applications/virtualization/xen { };
xfe = callPackage ../applications/misc/xfe { };
xfig = callPackage ../applications/graphics/xfig {
stdenv = overrideGCC stdenv gcc34;
};