ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 06:47:09 +03:00
Code Issues Projects Releases Wiki Activity

* Sync.

Browse Source 
svn path=/nixpkgs/branches/cve-2010-3856/; revision=24936
This commit is contained in:
Eelco Dolstra 2010-11-30 11:39:53 +00:00
commit 86d51032cc
10 changed files with 182 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "mysql-workbench";
version = "5.2.28";
version = "5.2.30";
name = "${pname}-${version}";
src = fetchurl {
url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
sha256 = "1i7icrf3z09rijlvlg99w6m1n3xw0650840hk95ymgrb95kc3437";
sha256 = "0dlhnq7pv2ccgm0d7a3hzf9jxa09jzw36h0ljs9vw9q5nyd5kq71";
};
buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool

2
pkgs/applications/science/electronics/verilog/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "verilog-0.9.3";
src = fetchurl {
url = "mirror://sourceforce/${name}.tar.gz";
url = "mirror://sourceforge/iverilog/${name}.tar.gz";
sha256 = "dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba";
};

48
pkgs/games/crrcsim/default.nix Normal file
View File

@ -0,0 +1,48 @@
x@{builderDefsPackage
, mesa, SDL, SDL_mixer, plib, libjpeg
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="crrcsim";
version="0.9.11";
name="${baseName}-${version}";
url="http://download.berlios.de/${baseName}/${name}.tar.gz";
hash="16z9gixp60920lqckij8kdw90jys0llls4lw5c8vqgk14ck5hhiz";
};
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 = "A model-airplane flight simulator";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = "GPLv2";
};
passthru = {
updateInfo = {
downloadPage = "http://crrcsim.berlios.de/wiki/index.php?n=CRRCsim.DownLoad";
};
};
}) x

41
pkgs/games/gl-117/default.nix Normal file
View File

@ -0,0 +1,41 @@
x@{builderDefsPackage
, mesa, SDL, freeglut, SDL_mixer, autoconf, automake, libtool
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
version = "1.3.2";
name = "gl-117-1.3.2";
url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/gl-117-1.3.2-src.tar.bz2";
hash = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4";
};
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 = "An air combat simulator";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
};
}) x

25
pkgs/shells/ipython/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchurl, buildPythonPackage }:
buildPythonPackage {
name = "ipython-0.10.1";
src = fetchurl {
url = "http://ipython.scipy.org/dist/0.10.1/ipython-0.10.1.tar.gz";
sha256 = "18zwrg25zn72w4rmcwxzcw11ibgp001fawm2sz189zv86z70fxi2";
};
doCheck = false;
meta = {
homepage = http://ipython.scipy.org/;
description = "An interactive computing environment for Python";
license = "BSD";
longDescription = ''
The goal of IPython is to create a comprehensive environment
for interactive and exploratory computing. It consists of an
enhanced interactive Python shell and an architecture for
interactive parallel computing.
'';
};
}

29
pkgs/tools/networking/wicd/default.nix
View File

@ -6,11 +6,11 @@
# on urwid which has not been packaged at this time (2009-12-27).
stdenv.mkDerivation rec {
name = "wicd-1.6.2.2";
name = "wicd-1.7.0";
src = fetchurl {
url = "mirror://sourceforge/wicd/files/wicd-stable/${name}/${name}.tar.bz2";
sha256 = "1gpjrlanz7rrzkchnpm1dgik333rz1fsg4c4046c5pwdfpp1crxr";
url = "mirror://sourceforge/project/wicd/wicd-stable/${name}/${name}.tar.bz2";
sha256 = "0civfmpjlsvnaiw7fkpq34mh5ndhfzb9mkl3q2d3rjd4z0mnki8l";
};
buildInputs = [ python ];
@ -19,24 +19,34 @@ stdenv.mkDerivation rec {
# Should I be using pygtk's propogated build inputs?
postPatch = ''
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
'';
configurePhase = ''
python setup.py configure \
--lib=$out/lib/ \
--etc=/var/lib/wicd/ \
--share=$out/share/ \
--etc=/var/lib/wicd/ \
--scripts=$out/etc/scripts/ \
--images=$out/share/pixmaps/ \
--pixmaps=$out/share/pixmaps/ \
--images=$out/share/pixmaps/wicd/ \
--encryption=$out/etc/encryption/templates/ \
--bin=$out/bin/ \
--sbin=$out/sbin/ \
--backends=$out/lib/backends/ \
--backends=$out/share/backends/ \
--daemon=$out/share/daemon/ \
--curses=$out/share/curses/ \
--gtk=$out/share/gtk/ \
--cli=$out/share/cli/ \
--networks=/var/lib/wicd/configurations/ \
--resume=$out/etc/acpi/resume.d/ \
--suspend=$out/etc/acpi/suspend.d/ \
@ -60,7 +70,11 @@ stdenv.mkDerivation rec {
--no-install-ncurses \
'';
installPhase = ''python setup.py install --prefix=$out'';
installPhase = ''
python setup.py install --prefix=$out
ensureDir $out/share/other
cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default
'';
meta = {
homepage = http://wicd.net/;
@ -74,6 +88,7 @@ stdenv.mkDerivation rec {
encryption types, such as WPA and WEP. Wicd will automatically
connect at startup to any preferred network within range.
'';
maintainers = [ stdenv.lib.maintainers.roconnor ];
license="GPLv2";
};
}

13
pkgs/tools/networking/wicd/mkdir-networks.patch
View File

@ -1,11 +1,12 @@
wicd normally makes the NETWORKS directory at install time, but we cannot do that,
so we make it at runtime instead.
wicd normally makes the NETWORKS directory and install the dhclient.conf.template.default at install time,
but we cannot do that, so we make it at runtime instead.
--- wicd-1.6.2.2/in/scripts=wicd.in 2009-09-01 11:05:31.000000000 -0400
+++ wicd-1.6.2.2/in/scripts=wicd.in 2010-01-04 18:01:57.000000000 -0500
@@ -1,3 +1,5 @@
--- wicd-1.7.0/in/scripts=wicd.in 2010-01-14 23:49:11.000000000 -0500
+++ wicd-1.7.0/in/scripts=wicd.in 2010-11-16 22:35:50.272555487 -0500
@@ -1,3 +1,6 @@
#!/bin/bash
+mkdir -p %NETWORKS%
+ln -sf @TEMPLATE-DEFAULT@ %ETC%dhclient.conf.template.default
+
exec python -O %LIB%wicd-daemon.py $@
exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@

37
pkgs/tools/networking/wicd/no-var-install.patch
View File

@ -1,21 +1,16 @@
The install tries to create files in /var. This patch removes those steps.
--- wicd-1.6.2.2/setup.py 2009-09-01 11:05:31.000000000 -0400
+++ wicd-1.6.2.2/setup.py 2009-12-27 21:27:57.000000000 -0500
@@ -464,8 +464,6 @@
data = [
(wpath.dbus, ['other/wicd.conf']),
(wpath.desktop, ['other/wicd.desktop']),
- (wpath.log, []),
- (wpath.etc, []),
(wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-client.svg']),
(wpath.icons + '192x192/apps/', ['icons/192px/wicd-client.png']),
(wpath.icons + '128x128/apps/', ['icons/128px/wicd-client.png']),
@@ -481,7 +479,6 @@
(wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')]),
(wpath.encryption, [('encryption/templates/' + b) for b in
os.listdir('encryption/templates') if not b.startswith('.')]),
- (wpath.networks, []),
(wpath.bin, ['scripts/wicd-client', ]),
(wpath.sbin, ['scripts/wicd', ]),
(wpath.share, ['data/wicd.glade', ]),
The install tries to create files in /var. This patch removes those steps.
--- wicd-1.7.0/setup.py 2010-01-14 23:49:11.000000000 -0500
+++ wicd-1.7.0/setup.py 2010-11-16 22:15:33.855977242 -0500
@@ -493,11 +493,8 @@
print "Using init file",(wpath.init, wpath.initfile)
data = [
(wpath.dbus, ['other/wicd.conf']),
- (wpath.log, [empty_file]),
- (wpath.etc, ['other/dhclient.conf.template.default']),
(wpath.encryption, [('encryption/templates/' + b) for b in
os.listdir('encryption/templates') if not b.startswith('.')]),
- (wpath.networks, [empty_file]),
(wpath.sbin, ['scripts/wicd']),
(wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py',
'wicd/suspend.py', 'wicd/autoconnect.py']),

4
pkgs/tools/networking/wicd/pygtk.patch
View File

@ -1,8 +1,8 @@
For some reason nix's pygtk doesn't have a pygtk module so we remove the version check.
If this ever changes we could remove this patch.
--- wicd-1.6.2.2/wicd/wicd-client.py 2009-09-01 11:05:31.000000000 -0400
+++ wicd-1.6.2.2/wicd/wicd-client.py 2009-12-28 00:22:57.000000000 -0500
--- wicd-1.7.0/gtk/wicd-client.py 2009-09-01 11:05:31.000000000 -0400
+++ wicd-1.7.0/gtk/wicd-client.py 2009-12-28 00:22:57.000000000 -0500
@@ -43,9 +43,6 @@
import atexit
from dbus import DBusException

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

@ -1443,6 +1443,20 @@ let
dash = callPackage ../shells/dash { };
ipython = callPackage ../shells/ipython {
# I did not find any better way of reusing buildPythonPackage+setuptools
# for a python with openssl support
buildPythonPackage = assert pythonFull.readlineSupport;
import ../development/python-modules/generic {
inherit makeWrapper lib;
python = pythonFull;
setuptools = builderDefsPackage (import ../development/python-modules/setuptools) {
inherit makeWrapper;
python = pythonFull;
};
};
};
tcsh = callPackage ../shells/tcsh { };
rush = callPackage ../shells/rush { };
@ -6622,6 +6636,8 @@ let
crack_attack = callPackage ../games/crack-attack { };
crrcsim = callPackage ../games/crrcsim {};
dwarf_fortress = callPackage_i686 ../games/dwarf-fortress {
gnomegtk = pkgsi686Linux.gnome.gtk;
};
@ -6651,6 +6667,8 @@ let
stdenv = stdenv2;
};
gl117 = callPackage ../games/gl-117 {};
gltron = callPackage ../games/gltron { };
gnuchess = builderDefsPackage (import ../games/gnuchess) {