mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
* Last sync.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15320
This commit is contained in:
commit
914f2d6cf6
@ -0,0 +1,27 @@
|
|||||||
|
{stdenv, fetchurl, emacs}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "session-management-for-emacs-2.2a";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz";
|
||||||
|
sha256 = "0i01dnkizs349ahyybzy0mjzgj52z65rxynsj2mlw5mm41sbmprp";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [emacs];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
ensureDir "$out/share/emacs/site-lisp"
|
||||||
|
cp lisp/*.el "$out/share/emacs/site-lisp/"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
/* installation: add to your ~/.emacs
|
||||||
|
(require 'session)
|
||||||
|
(add-hook 'after-init-hook 'session-initialize)
|
||||||
|
*/
|
||||||
|
description = "small session management for emacs";
|
||||||
|
homepage = http://emacs-session.sourceforge.net/;
|
||||||
|
license = "GPL";
|
||||||
|
};
|
||||||
|
}
|
@ -3,7 +3,7 @@ let
|
|||||||
lib = args.lib;
|
lib = args.lib;
|
||||||
fetchurl = args.fetchurl;
|
fetchurl = args.fetchurl;
|
||||||
|
|
||||||
version = lib.getAttr ["version"] "0.5.0" args;
|
version = lib.getAttr ["version"] "0.5.1" args;
|
||||||
buildInputs = with args; [
|
buildInputs = with args; [
|
||||||
chipmunk sqlite curl zlib bzip2 libjpeg libpng
|
chipmunk sqlite curl zlib bzip2 libjpeg libpng
|
||||||
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
|
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
|
||||||
@ -13,7 +13,7 @@ in
|
|||||||
rec {
|
rec {
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
|
url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
|
||||||
sha256 = "0gy9rjmjns4kbqfrdh9v1bg1w92xipxv3ia9w1wh2c58rp1p0nkh";
|
sha256 = "1clfw4kr34gda9ml427n8mdkhj0hhlldibiq1ay88glqqwvgj2j2";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
|
@ -1,5 +1,15 @@
|
|||||||
{ stdenv, fetchurl, readline, pam, openldap, kerberos, popt
|
{ stdenv, fetchurl, readline, pam, openldap, kerberos, popt
|
||||||
, iniparser, libunwind, fam, acl
|
, iniparser, libunwind, fam, acl
|
||||||
|
|
||||||
|
# Eg. smbclient and smbspool require a smb.conf file.
|
||||||
|
# If you set configDir to "" an empty configuration file
|
||||||
|
# $out/lib/smb.conf is is created for you.
|
||||||
|
#
|
||||||
|
# configDir defaults to "/etc/samba" so that smbpassword picks up
|
||||||
|
# the location of its passwd db files from the system configuration file
|
||||||
|
# /etc/samba/smb.conf. That's why nixos touches /etc/samba/smb.conf even if you
|
||||||
|
# don't enable the samba upstart service.
|
||||||
|
, configDir ? "/etc/samba"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -14,11 +24,14 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
preConfigure = "cd source";
|
preConfigure = "cd source";
|
||||||
|
|
||||||
# Provide a dummy smb.conf to shut up programs like smbclient and smbspool.
|
postInstall = if configDir == ""
|
||||||
postInstall = ''
|
then "touch $out/lib/smb.conf"
|
||||||
touch $out/lib/smb.conf
|
else "";
|
||||||
'';
|
|
||||||
|
|
||||||
|
# Don't pass --with-private-dir=/var/samba/private
|
||||||
|
# --with-lockdir=/var/samba/lock
|
||||||
|
# the build system will try to create it.
|
||||||
configureFlags = ''
|
configureFlags = ''
|
||||||
--with-pam
|
--with-pam
|
||||||
--with-cifsmount
|
--with-cifsmount
|
||||||
@ -26,6 +39,7 @@ stdenv.mkDerivation rec {
|
|||||||
--with-pam_smbpass
|
--with-pam_smbpass
|
||||||
--disable-swat
|
--disable-swat
|
||||||
--enable-shared-libs
|
--enable-shared-libs
|
||||||
|
--with-configdir=${configDir}
|
||||||
${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""}
|
${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""}
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
22
pkgs/tools/misc/figlet/default.nix
Normal file
22
pkgs/tools/misc/figlet/default.nix
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
args:
|
||||||
|
args.stdenv.mkDerivation {
|
||||||
|
name = "figlet-222";
|
||||||
|
|
||||||
|
# some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/
|
||||||
|
src = args.fetchurl {
|
||||||
|
url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet222.tar.gz;
|
||||||
|
sha256 = "1y22hhwxhnwd6yrjgl5p3p44r22xzrhv9cksj58n85laac6jdfhs";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs =(with args; []);
|
||||||
|
preConfigure = ''
|
||||||
|
ensureDir $out/{man/man6,bin}
|
||||||
|
makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description="program for making large letters out of ordinary text";
|
||||||
|
homepage = http://www.figlet.org/;
|
||||||
|
license = "AFL-2.1";
|
||||||
|
};
|
||||||
|
}
|
22
pkgs/tools/pydb/default.nix
Normal file
22
pkgs/tools/pydb/default.nix
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
args:
|
||||||
|
args.stdenv.mkDerivation {
|
||||||
|
name = "pydb-1.26";
|
||||||
|
|
||||||
|
src = args.fetchurl {
|
||||||
|
url = "mirror://sourceforge.net/sourceforge/bashdb/pydb-1.26.tar.bz2";
|
||||||
|
sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs =(with args; [python emacs /* emacs is optional */]);
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
p="$(toPythonPath $out)"
|
||||||
|
configureFlags="$configureFlags --with-python=${args.python}/bin/python --with-site-packages=$p"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "python debugger with gdb like commands and emacs bindings";
|
||||||
|
homepage = http://bashdb.sourceforge.net/pydb/;
|
||||||
|
license = "GPLv3";
|
||||||
|
};
|
||||||
|
}
|
@ -599,6 +599,10 @@ let
|
|||||||
inherit fetchurl stdenv emacs;
|
inherit fetchurl stdenv emacs;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
emacsSessionManagement = import ../applications/editors/emacs-modes/session-management-for-emacs {
|
||||||
|
inherit fetchurl stdenv emacs;
|
||||||
|
};
|
||||||
|
|
||||||
enblendenfuse = import ../tools/graphics/enblend-enfuse {
|
enblendenfuse = import ../tools/graphics/enblend-enfuse {
|
||||||
inherit fetchurl stdenv libtiff libpng lcms libxmi boost;
|
inherit fetchurl stdenv libtiff libpng lcms libxmi boost;
|
||||||
};
|
};
|
||||||
@ -628,6 +632,10 @@ let
|
|||||||
inherit fetchurl stdenv perl;
|
inherit fetchurl stdenv perl;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
figlet = import ../tools/misc/figlet {
|
||||||
|
inherit fetchurl stdenv;
|
||||||
|
};
|
||||||
|
|
||||||
file = import ../tools/misc/file {
|
file = import ../tools/misc/file {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
@ -1130,6 +1138,10 @@ let
|
|||||||
inherit stdenv fetchurl;
|
inherit stdenv fetchurl;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pydb = import ../tools/pydb {
|
||||||
|
inherit fetchurl stdenv python emacs;
|
||||||
|
};
|
||||||
|
|
||||||
pystringtemplate = import ../development/python-modules/stringtemplate {
|
pystringtemplate = import ../development/python-modules/stringtemplate {
|
||||||
inherit stdenv fetchurl python antlr;
|
inherit stdenv fetchurl python antlr;
|
||||||
};
|
};
|
||||||
@ -4417,7 +4429,7 @@ let
|
|||||||
inherit xmpppy python makeWrapper fetchcvs;
|
inherit xmpppy python makeWrapper fetchcvs;
|
||||||
};
|
};
|
||||||
|
|
||||||
samba = import ../servers/samba {
|
samba = makeOverridable (import ../servers/samba) {
|
||||||
inherit stdenv fetchurl readline openldap pam kerberos popt iniparser
|
inherit stdenv fetchurl readline openldap pam kerberos popt iniparser
|
||||||
libunwind acl fam;
|
libunwind acl fam;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user