Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
This commit is contained in:
Lluís Batlle i Rossell
commit
46082f25f9
@ -14,7 +14,8 @@ composableDerivation {} {
|
|||||||
configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
|
configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
|
||||||
|
|
||||||
buildNativeInputs = [ncurses pkgconfig]
|
buildNativeInputs = [ncurses pkgconfig]
|
||||||
++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu ];
|
++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib
|
||||||
|
libICE ];
|
||||||
|
|
||||||
# most interpreters aren't tested yet.. (see python for example how to do it)
|
# most interpreters aren't tested yet.. (see python for example how to do it)
|
||||||
flags = {
|
flags = {
|
||||||
@ -30,17 +31,18 @@ composableDerivation {} {
|
|||||||
// edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter.
|
// edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter.
|
||||||
// edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter.
|
// edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter.
|
||||||
// edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter.
|
// edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter.
|
||||||
|
// edf { name = "lua" ; feat = "luainterp"; enable = { buildNativeInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
|
||||||
// edf { name = "cscope"; } #Include cscope interface.
|
// edf { name = "cscope"; } #Include cscope interface.
|
||||||
// edf { name = "workshop"; } #Include Sun Visual Workshop support.
|
// edf { name = "workshop"; } #Include Sun Visual Workshop support.
|
||||||
// edf { name = "netbeans"; } #Disable NetBeans integration support.
|
// edf { name = "netbeans"; } #Disable NetBeans integration support.
|
||||||
// edf { name = "sniff"; } #Include Sniff interface.
|
// edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface.
|
||||||
// edf { name = "multibyte"; } #Include multibyte editing support.
|
// edf { name = "multibyte"; } #Include multibyte editing support.
|
||||||
// edf { name = "hangulinput"; } #Include Hangul input support.
|
// edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support.
|
||||||
# // edf { name = "xim"; enable = { buildNativeInputs = [xim]; }; } #Include XIM input support.
|
// edf { name = "xim"; } #Include XIM input support.
|
||||||
// edf { name = "fontset"; } #Include X fontset output support.
|
// edf { name = "fontset"; } #Include X fontset output support.
|
||||||
// edf { name = "acl"; } #Don't check for ACL support.
|
// edf { name = "acl"; } #Don't check for ACL support.
|
||||||
// edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
|
// edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
|
||||||
// edf { name = "nls"; } #Don't support NLS (gettext()).
|
// edf { name = "nls"; enable = {buildNativeInputs = [gettext];}; } #Don't support NLS (gettext()).
|
||||||
;
|
;
|
||||||
|
|
||||||
cfg = {
|
cfg = {
|
||||||
|
|||||||
@ -3,13 +3,13 @@
|
|||||||
assert stdenv.system == "i686-linux";
|
assert stdenv.system == "i686-linux";
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "adobe-reader-9.2-1";
|
name = "adobe-reader-9.3.3-1";
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.2/enu/AdbeRdr9.2-1_i486linux_enu.tar.bz2;
|
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.3.3/enu/AdbeRdr9.3.3-1_i486linux_enu.tar.bz2;
|
||||||
sha256 = "0067w0kjj2c04342g8c9qvcs49kkiqlxn2zyx9qzlg7a32qfc9l2";
|
sha256 = "1qssbdjy3v07agyh55bhsmvzakq9bs3hd6dw032ikwbpvb2gs807";
|
||||||
};
|
};
|
||||||
|
|
||||||
# !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
|
# !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
|
||||||
|
|||||||
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
libPath =
|
libPath =
|
||||||
stdenv.lib.makeLibraryPath
|
stdenv.lib.makeLibraryPath
|
||||||
[ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib cups libgcrypt] ;
|
[ stdenv.gcc.libc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib cups libgcrypt] ;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
ensureDir $out/bin
|
ensureDir $out/bin
|
||||||
|
|||||||
@ -46,11 +46,11 @@ in with stdenv; mkDerivation rec {
|
|||||||
meaning that one (or multiple) client(s) can attach to
|
meaning that one (or multiple) client(s) can attach to
|
||||||
and detach from a central core -- much like the popular
|
and detach from a central core -- much like the popular
|
||||||
combination of screen and a text-based IRC client such
|
combination of screen and a text-based IRC client such
|
||||||
as WeeChat, but graphical(based on Qt4/KDE4).
|
as WeeChat, but graphical (based on Qt4/KDE4).
|
||||||
'';
|
'';
|
||||||
license = "GPLv3";
|
license = "GPLv3";
|
||||||
maintainers = [ maintainers.phreedom ];
|
maintainers = [ maintainers.phreedom ];
|
||||||
platforms = platforms.all;
|
inherit (qt4.meta) platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
18
pkgs/applications/networking/irc/weechat/default.nix
Normal file
18
pkgs/applications/networking/irc/weechat/default.nix
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{stdenv, fetchurl, ncurses, openssl, perl, python, aspell}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "weechat-0.3.2";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = http://weechat.org/files/src/weechat-0.3.2.tar.gz;
|
||||||
|
sha256 = "0ds548fmiv2fg69amhyg1v1rgyw51rqlp64p3rmsbm1lkcwwmivc";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ncurses perl python openssl aspell];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://http://www.weechat.org/;
|
||||||
|
description = "A fast, light and extensible chat client";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
@ -4,19 +4,15 @@
|
|||||||
{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
|
{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
version = "8.2pl2";
|
||||||
pname = "coq";
|
|
||||||
version = "8.2pl1";
|
|
||||||
name = "${pname}-${version}";
|
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit name;
|
name = "coq-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://coq.inria.fr/V${version}/files/${name}.tar.gz";
|
url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
|
||||||
sha256 = "7c15acfd369111e51d937cce632d22fc77a6718a5ac9f2dd2dcbdfab4256ae0c";
|
sha256 = "0dh2vv3bvz8694dd12kjdkdaq19l1vslvygzif11igshc5bw4rhf";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ ocaml camlp5 ncurses lablgtk ];
|
buildInputs = [ ocaml camlp5 ncurses lablgtk ];
|
||||||
|
|||||||
@ -12,11 +12,11 @@ let
|
|||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "git-1.7.1";
|
name = "git-1.7.2.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
|
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
|
||||||
sha256 = "bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2";
|
sha256 = "5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./docbook2texi.patch ];
|
patches = [ ./docbook2texi.patch ];
|
||||||
|
|||||||
@ -0,0 +1,34 @@
|
|||||||
|
# patch "agraph.ml"
|
||||||
|
# from [8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e]
|
||||||
|
# to [05aa88921481ac9bfe238daeb4374fbc9993caaa]
|
||||||
|
#
|
||||||
|
============================================================
|
||||||
|
--- a/agraph.ml 8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e
|
||||||
|
+++ b/agraph.ml 05aa88921481ac9bfe238daeb4374fbc9993caaa
|
||||||
|
@@ -50,8 +50,9 @@ let dot_format params agraph =
|
||||||
|
agraph.nodes in
|
||||||
|
|
||||||
|
!+ "digraph \"monotone-viz\"\n{\n" ;
|
||||||
|
- if params.lr_layout then
|
||||||
|
- !+ " graph [rankdir=LR] ;\n" ;
|
||||||
|
+ if params.lr_layout
|
||||||
|
+ then !+ " graph [rankdir=LR] ;\n"
|
||||||
|
+ else !+ " graph [rankdir=BT] ;\n" ;
|
||||||
|
!+ " graph [ranksep=\"0.25\"] ;\n" ;
|
||||||
|
!+ " node [label=\"\"] ;\n" ;
|
||||||
|
|
||||||
|
@@ -222,11 +223,11 @@ let spawn_dot graph status done_cb =
|
||||||
|
let dot_prg = graph.layout_params.dot_program in
|
||||||
|
let cmd =
|
||||||
|
if Viz_misc.debug "dot"
|
||||||
|
- then [ "/bin/sh" ; "-c" ;
|
||||||
|
+ then [ "/bin/sh" ; "-c" ;
|
||||||
|
Printf.sprintf
|
||||||
|
"set -o pipefail ; \
|
||||||
|
- tee agraph.in.dot | %s -q -y -s%.0f | tee agraph.out.dot" dot_prg ppi ]
|
||||||
|
- else [ dot_prg ; "-q" ; "-y" ; Printf.sprintf "-s%.0f" ppi ] in
|
||||||
|
+ tee agraph.in.dot | %s -q -s%.0f | tee agraph.out.dot" dot_prg ppi ]
|
||||||
|
+ else [ dot_prg ; "-q" ; Printf.sprintf "-s%.0f" ppi ] in
|
||||||
|
let error fmt =
|
||||||
|
Printf.kprintf (fun s -> done_cb (`LAYOUT_ERROR s)) fmt in
|
||||||
|
try
|
||||||
@ -3,9 +3,9 @@ rec {
|
|||||||
src = fetchmtn {
|
src = fetchmtn {
|
||||||
name = "monotone-viz-mtn-checkout";
|
name = "monotone-viz-mtn-checkout";
|
||||||
dbs = ["monotone.ca"];
|
dbs = ["monotone.ca"];
|
||||||
selector = "0e9194c89eb87e62ac7d54c7b88b10b94b07fa41";
|
selector = "b34ff2e695b53c2d73d533a3ffa7cb081b48eefb";
|
||||||
branch = "net.venge.monotone-viz.automate";
|
branch = "net.venge.monotone-viz.new-stdio";
|
||||||
sha256 = "d7980c9729b0a58f0dd27768b8eae46b45462fe72a88534b8aa159d889b4d624";
|
sha256 = "06263564bc111d865b50b4a9587a86f8d97fff47625a3c1cb98d90b79faf7889";
|
||||||
} + "/";
|
} + "/";
|
||||||
|
|
||||||
buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
|
buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
|
||||||
@ -13,13 +13,15 @@ rec {
|
|||||||
configureFlags = ["--with-lablgtk-dir=${lablgtk}/lib/ocaml/lablgtk2"];
|
configureFlags = ["--with-lablgtk-dir=${lablgtk}/lib/ocaml/lablgtk2"];
|
||||||
|
|
||||||
/* doConfigure should be specified separately */
|
/* doConfigure should be specified separately */
|
||||||
phaseNames = ["doAutoconf" "doConfigure" "doMakeInstall"];
|
phaseNames = ["doAutoconf" "doPatch" "doConfigure" "doMakeInstall"];
|
||||||
|
|
||||||
doAutoconf = fullDepEntry(''
|
doAutoconf = fullDepEntry(''
|
||||||
aclocal -I .
|
aclocal -I .
|
||||||
autoconf -I .
|
autoconf -I .
|
||||||
'') ["minInit" "addInputs" "doUnpack"];
|
'') ["minInit" "addInputs" "doUnpack"];
|
||||||
|
|
||||||
|
patches = [ ./graphviz.patch ];
|
||||||
|
|
||||||
name = "monotone-viz-mtn-head";
|
name = "monotone-viz-mtn-head";
|
||||||
meta = {
|
meta = {
|
||||||
description = "Monotone commit tree visualizer";
|
description = "Monotone commit tree visualizer";
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl, lib, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext
|
{ stdenv, fetchurl, lib, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext
|
||||||
, libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
|
, libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
|
||||||
, python, which, alsaLib, curl
|
, python, which, alsaLib, curl, gawk
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@ -72,7 +72,7 @@ stdenv.mkDerivation {
|
|||||||
sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
|
sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
|
||||||
-e "s|@QT4_PATH@|${qt4}/lib|" \
|
-e "s|@QT4_PATH@|${qt4}/lib|" \
|
||||||
-e "s|which|${which}/bin/which|" \
|
-e "s|which|${which}/bin/which|" \
|
||||||
-e "s|awk|${stdenv.gawk}/bin/awk|" \
|
-e "s|awk|${gawk}/bin/awk|" \
|
||||||
$out/bin/VBox.sh
|
$out/bin/VBox.sh
|
||||||
chmod 755 $out/bin/VBox.sh
|
chmod 755 $out/bin/VBox.sh
|
||||||
for file in VirtualBox VBoxManage VBoxSDL
|
for file in VirtualBox VBoxManage VBoxSDL
|
||||||
|
|||||||
@ -4,11 +4,11 @@
|
|||||||
, docbook_xml_dtd_45, libxslt, coreutils}:
|
, docbook_xml_dtd_45, libxslt, coreutils}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "awesome-3.4.5";
|
name = "awesome-3.4.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://awesome.naquadah.org/download/awesome-3.4.5.tar.xz;
|
url = http://awesome.naquadah.org/download/awesome-3.4.6.tar.xz;
|
||||||
sha256 = "124g6k4n2yf9shw3ig9lj1jdwiysfbj13mnjd38k22hqbj3yhnbi";
|
sha256 = "1bxym326pl32q5jsaqa7p785k8yviinzj0q1l42pdhiiq717zbwi";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
|
buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
|
||||||
|
|||||||
@ -108,7 +108,7 @@ sub addPkg($;$) {
|
|||||||
my @args = split ' ', $ENV{"paths"};
|
my @args = split ' ', $ENV{"paths"};
|
||||||
|
|
||||||
foreach my $pkgDir (@args) {
|
foreach my $pkgDir (@args) {
|
||||||
addPkg($pkgDir, $ENV{"ignoreCollisions"} eq "1");
|
addPkg($pkgDir, $ENV{"ignoreCollisions"} eq "1") if -e $pkgDir;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -100,4 +100,8 @@ stdenv.mkDerivation {
|
|||||||
] ++ (map (site: "NIX_MIRRORS_${site}") sites);
|
] ++ (map (site: "NIX_MIRRORS_${site}") sites);
|
||||||
|
|
||||||
inherit showURLs mirrorsFile;
|
inherit showURLs mirrorsFile;
|
||||||
|
|
||||||
|
# Doing the download on a remote machine just duplicates network
|
||||||
|
# traffic, so don't do that.
|
||||||
|
preferLocalBuild = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses,
|
{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses,
|
||||||
pythonSupport ? false, python}:
|
pythonSupport ? false, python}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "vte-0.22.5";
|
name = "vte-0.25.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/desktop/2.28/2.28.2/sources/${name}.tar.bz2";
|
url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.25/${name}.tar.bz2";
|
||||||
sha256 = "1xmjlz79z3apxmq18d5qyliaky6xb1n2nxwvpzrdl4ky6hk73660";
|
sha256 = "105f5ifyg09nh5p6fw2w7c0n9wd8vw9cvwlh6zg49ibsar893qi5";
|
||||||
};
|
};
|
||||||
buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
|
buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
|
||||||
stdenv.lib.optional pythonSupport python;
|
stdenv.lib.optional pythonSupport python;
|
||||||
|
|||||||
@ -12,6 +12,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE accessibility tools";
|
description = "KDE accessibility tools";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,6 +23,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE Administration Utilities";
|
description = "KDE Administration Utilities";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,6 +14,6 @@ stdenv.mkDerivation {
|
|||||||
longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers";
|
longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,6 +22,6 @@ stdenv.mkDerivation {
|
|||||||
longDescription = "Libraries and tools which supports running KDE desktop applications";
|
longDescription = "Libraries and tools which supports running KDE desktop applications";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,6 +23,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE Workspace";
|
description = "KDE Workspace";
|
||||||
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
|
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,6 +15,6 @@ stdenv.mkDerivation {
|
|||||||
longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
|
longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,6 +35,6 @@ stdenv.mkDerivation {
|
|||||||
longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
|
longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,6 +15,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE Educative software";
|
description = "KDE Educative software";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE Games";
|
description = "KDE Games";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,6 +19,6 @@ stdenv.mkDerivation {
|
|||||||
Okular a document reader.
|
Okular a document reader.
|
||||||
'';
|
'';
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,6 +28,7 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE libraries";
|
description = "KDE libraries";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
maintainers = [ lib.maintainers.sander lib.maintainers.urkud ];
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,6 +16,6 @@ stdenv.mkDerivation {
|
|||||||
'';
|
'';
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,6 +18,6 @@ stdenv.mkDerivation {
|
|||||||
longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
|
longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,5 +12,6 @@ stdenv.mkDerivation {
|
|||||||
longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
|
longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
maintainers = [ lib.maintainers.sander ];
|
maintainers = [ lib.maintainers.sander ];
|
||||||
|
platforms = lib.platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,6 +16,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE PIM runtime";
|
description = "KDE PIM runtime";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,6 +19,6 @@ stdenv.mkDerivation {
|
|||||||
'';
|
'';
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,6 +13,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE PIM libraries";
|
description = "KDE PIM libraries";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,6 +18,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE Plasma Addons";
|
description = "KDE Plasma Addons";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,7 +17,6 @@ stdenv.mkDerivation {
|
|||||||
longDescription = "Contains various development utilities such as the Umbrello UML modeler and Cerivisia CVS front-end";
|
longDescription = "Contains various development utilities such as the Umbrello UML modeler and Cerivisia CVS front-end";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ maintainers.sander maintainers.urkud ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE Toys";
|
description = "KDE Toys";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,6 +21,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE Utilities";
|
description = "KDE Utilities";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,6 +12,6 @@ stdenv.mkDerivation {
|
|||||||
description = "KDE Web development utilities";
|
description = "KDE Web development utilities";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
maintainers = [ lib.maintainers.sander ];
|
inherit (kdelibs.meta) maintainers platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,79 +1,38 @@
|
|||||||
pkgs:
|
{ callPackage, stdenv, fetchurl } :
|
||||||
|
|
||||||
pkgs.recurseIntoAttrs (rec {
|
{
|
||||||
|
recurseForRelease = true;
|
||||||
|
|
||||||
|
kdePackage = import ./kde-package {
|
||||||
|
inherit stdenv fetchurl;
|
||||||
|
};
|
||||||
|
|
||||||
### SUPPORT
|
### SUPPORT
|
||||||
akonadi = import ./support/akonadi {
|
akonadi = callPackage ./support/akonadi { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost
|
|
||||||
mysql;
|
|
||||||
inherit automoc4 soprano;
|
|
||||||
};
|
|
||||||
|
|
||||||
attica = import ./support/attica {
|
attica = callPackage ./support/attica { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
automoc4 = import ./support/automoc4 {
|
automoc4 = callPackage ./support/automoc4 { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
oxygen_icons = import ./support/oxygen-icons {
|
oxygen_icons = callPackage ./support/oxygen-icons { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake;
|
|
||||||
};
|
|
||||||
|
|
||||||
# phonon = import ./support/phonon {
|
polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
|
||||||
# inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 xineLib pulseaudio;
|
|
||||||
# inherit (pkgs.gst_all) gstreamer gstPluginsBase;
|
|
||||||
# inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
|
|
||||||
# inherit automoc4;
|
|
||||||
# };
|
|
||||||
#
|
|
||||||
polkit_qt_1 = import ./support/polkit-qt-1 {
|
|
||||||
inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 glib polkit;
|
|
||||||
inherit automoc4;
|
|
||||||
};
|
|
||||||
|
|
||||||
strigi = import ./support/strigi {
|
strigi = callPackage ./support/strigi { };
|
||||||
inherit (pkgs) stdenv fetchurl lib cmake perl;
|
|
||||||
inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore;
|
|
||||||
};
|
|
||||||
|
|
||||||
soprano = import ./support/soprano {
|
soprano = callPackage ./support/soprano { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake cluceneCore redland libiodbc qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
qca2 = import ./support/qca2 {
|
qca2 = callPackage ./support/qca2 { };
|
||||||
inherit (pkgs) stdenv fetchurl which qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
qca2_ossl = import ./support/qca2/ossl.nix {
|
qca2_ossl = callPackage ./support/qca2/ossl.nix { };
|
||||||
inherit (pkgs) stdenv fetchurl qt4 openssl;
|
|
||||||
inherit qca2;
|
|
||||||
inherit (pkgs) fetchsvn;
|
|
||||||
};
|
|
||||||
|
|
||||||
### LIBS
|
### LIBS
|
||||||
kdelibs = import ./libs {
|
kdelibs = callPackage ./libs { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
|
|
||||||
inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info
|
|
||||||
kerberos acl attr shared_desktop_ontologies enchant libdbusmenu_qt;
|
|
||||||
inherit (pkgs) docbook_xsl docbook_xml_dtd_42;
|
|
||||||
inherit (pkgs.xlibs) libXScrnSaver;
|
|
||||||
inherit automoc4 strigi soprano qca2 attica polkit_qt_1;
|
|
||||||
};
|
|
||||||
|
|
||||||
kdepimlibs = import ./pimlibs {
|
kdepimlibs = callPackage ./pimlibs { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme libical
|
|
||||||
openldap shared_mime_info;
|
|
||||||
inherit kdelibs automoc4 akonadi soprano;
|
|
||||||
};
|
|
||||||
|
|
||||||
### DEVELOPMENT
|
### DEVELOPMENT
|
||||||
|
|
||||||
kdebindings = import ./bindings {
|
kdebindings = callPackage ./bindings { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake perl lib python sip zlib libpng pyqt4
|
|
||||||
freetype fontconfig qt4 boost ruby;
|
|
||||||
inherit kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1;
|
|
||||||
};
|
|
||||||
|
|
||||||
})
|
}
|
||||||
|
|||||||
17
pkgs/desktops/kde-4.5/kde-package/default.nix
Normal file
17
pkgs/desktops/kde-4.5/kde-package/default.nix
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
|
{ pn, v, stable ? true, sha256, subdir ? null }: args:
|
||||||
|
stdenv.mkDerivation ({
|
||||||
|
name = "${pn}-${v}";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://kde/" + (if stable then "" else "un") + "stable/" +
|
||||||
|
(if subdir == null then "${v}/src" else subdir) + "/${pn}-${v}.tar.bz2";
|
||||||
|
inherit sha256;
|
||||||
|
};
|
||||||
|
meta = {
|
||||||
|
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
|
||||||
|
platforms = stdenv.lib.platforms.linux;
|
||||||
|
inherit stable;
|
||||||
|
homepage = http://www.kde.org;
|
||||||
|
} // ( if args ? meta then args.meta else { } );
|
||||||
|
} // args)
|
||||||
@ -1,18 +1,15 @@
|
|||||||
{ stdenv, fetchurl, cmake, perl
|
{ kdePackage, gcc, cmake, perl
|
||||||
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
|
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
|
||||||
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
|
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
|
||||||
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
|
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
|
||||||
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
|
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
kdePackage {
|
||||||
name = "kdelibs-4.4.95";
|
pn = "kdelibs";
|
||||||
|
v = "4.5.0";
|
||||||
src = fetchurl {
|
sha256 = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
|
||||||
url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2";
|
} {
|
||||||
sha256 = "1fyjbdbzqxvl7rws4bvra1l4sczc1a72zdin7izif8dyjq6xblj0";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
|
cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
|
||||||
shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
|
shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
|
||||||
@ -20,9 +17,7 @@ stdenv.mkDerivation rec {
|
|||||||
automoc4 strigi soprano qca2 attica
|
automoc4 strigi soprano qca2 attica
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [ ./python-site-packages-install-dir.diff ];
|
propagatedBuildInputs = [ shared_desktop_ontologies gcc.libc ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ shared_desktop_ontologies stdenv.gcc.libc ];
|
|
||||||
|
|
||||||
# cmake fails to find acl.h because of C++-style comment
|
# cmake fails to find acl.h because of C++-style comment
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
@ -31,10 +26,8 @@ stdenv.mkDerivation rec {
|
|||||||
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
|
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = {
|
||||||
description = "KDE libraries";
|
description = "KDE libraries";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
homepage = http://www.kde.org;
|
|
||||||
maintainers = [ maintainers.sander maintainers.urkud ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,16 +1,14 @@
|
|||||||
{stdenv, fetchurl, cmake}:
|
{kdePackage, cmake}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
kdePackage {
|
||||||
name = "oxygen-icons-4.4.92";
|
pn = "oxygen-icons";
|
||||||
src = fetchurl {
|
v = "4.5.0";
|
||||||
url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
|
sha256 = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
|
||||||
sha256 = "1aqc5p93c9jz660x94pxx7anamrpmwd490jy0lw38y99lbdhgz9k";
|
} {
|
||||||
};
|
|
||||||
buildInputs = [ cmake ];
|
buildInputs = [ cmake ];
|
||||||
meta = with stdenv.lib; {
|
meta = {
|
||||||
description = "KDE Oxygen theme icons";
|
description = "KDE Oxygen theme icons";
|
||||||
longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
|
longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
maintainers = [ maintainers.sander ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,13 +1,11 @@
|
|||||||
{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
|
{ kdePackage, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
kdePackage {
|
||||||
name = "polkit-qt-1-0.96.1";
|
pn = "polkit-qt-1";
|
||||||
|
v = "0.96.1";
|
||||||
src = fetchurl {
|
subdir = "apps/KDE4.x/admin";
|
||||||
url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
|
|
||||||
sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
|
sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
|
||||||
};
|
} {
|
||||||
|
|
||||||
buildInputs = [ cmake qt4 automoc4 ];
|
buildInputs = [ cmake qt4 automoc4 ];
|
||||||
propagatedBuildInputs = [ polkit glib ];
|
propagatedBuildInputs = [ polkit glib ];
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,10 +6,10 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "xfce-terminal-0.4.4";
|
name = "xfce-terminal-0.4.5";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.4.tar.bz2;
|
url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.5.tar.bz2;
|
||||||
sha256 = "1cmkrzgi2j5dgb1jigdqigf7fa84hh9l2bclgxzn17168cwpd1lw";
|
sha256 = "14w8mhmyrq6dd9574zfvq0pymknljckq6qgcv1r6c1r22jydrzcj";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig intltool libexo gtk vte libxfce4util ncurses ];
|
buildInputs = [ pkgconfig intltool libexo gtk vte libxfce4util ncurses ];
|
||||||
|
|||||||
@ -8,6 +8,7 @@ let
|
|||||||
];
|
];
|
||||||
in
|
in
|
||||||
|
|
||||||
|
(
|
||||||
assert a.stdenv ? gcc ;
|
assert a.stdenv ? gcc ;
|
||||||
assert a.stdenv.gcc ? gcc ;
|
assert a.stdenv.gcc ? gcc ;
|
||||||
assert a.stdenv.gcc ? libc ;
|
assert a.stdenv.gcc ? libc ;
|
||||||
@ -45,13 +46,13 @@ rec {
|
|||||||
/* doConfigure should be removed if not needed */
|
/* doConfigure should be removed if not needed */
|
||||||
phaseNames = ["setVars" "doUnpack" "preBuild"
|
phaseNames = ["setVars" "doUnpack" "preBuild"
|
||||||
"doConfigure" "doMakeInstall"];
|
"doConfigure" "doMakeInstall"];
|
||||||
|
}) // {
|
||||||
meta = {
|
meta = {
|
||||||
description = "GNU Common Lisp compiler working via GCC";
|
description = "GNU Common Lisp compiler working via GCC";
|
||||||
maintainers = [
|
maintainers = [
|
||||||
a.lib.maintainers.raskin
|
a.lib.maintainers.raskin
|
||||||
];
|
];
|
||||||
platforms = with a.lib.platforms;
|
platforms = with a.lib.platforms;
|
||||||
all;
|
linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchhg, bison, glibc, ed, which, bash, makeWrapper, perl, ...}:
|
{ stdenv, fetchhg, bison, glibc, ed, which, bash, coreutils, makeWrapper, perl }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2010-06-09";
|
version = "2010-06-09";
|
||||||
@ -29,8 +29,8 @@ stdenv.mkDerivation {
|
|||||||
sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo.go
|
sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo.go
|
||||||
sed -i 's,/bin/ed,${ed}/bin/ed,' src/cmd/6l/mkenam
|
sed -i 's,/bin/ed,${ed}/bin/ed,' src/cmd/6l/mkenam
|
||||||
|
|
||||||
sed -i -e 's,/bin/cat,${stdenv.coreutils}/bin/cat,' \
|
sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
|
||||||
-e 's,/bin/echo,${stdenv.coreutils}/bin/echo,' \
|
-e 's,/bin/echo,${coreutils}/bin/echo,' \
|
||||||
src/pkg/exec/exec_test.go
|
src/pkg/exec/exec_test.go
|
||||||
|
|
||||||
# Disabling the 'os/http/net' tests (they want files not available in
|
# Disabling the 'os/http/net' tests (they want files not available in
|
||||||
|
|||||||
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c
|
sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c
|
||||||
sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.glibc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in
|
sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = ''
|
cmakeFlags = ''
|
||||||
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
|||||||
-DPATH64_ENABLE_PSCRUNTIME=OFF
|
-DPATH64_ENABLE_PSCRUNTIME=OFF
|
||||||
-DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664
|
-DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664
|
||||||
-DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF
|
-DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF
|
||||||
-DPSC_CRT_PATH=${stdenv.glibc}/lib
|
-DPSC_CRT_PATH=${stdenv.gcc.libc}/lib
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = "-j4";
|
makeFlags = "-j4";
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl }:
|
{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "heimdal-1.3.3";
|
name = "heimdal-1.3.3";
|
||||||
@ -14,7 +14,16 @@ stdenv.mkDerivation rec {
|
|||||||
patches = [ ./no-md2.patch ];
|
patches = [ ./no-md2.patch ];
|
||||||
|
|
||||||
## ugly, X should be made an option
|
## ugly, X should be made an option
|
||||||
configureFlags = "--with-openldap=${openldap} --without-x";
|
configureFlags = [
|
||||||
|
"--with-openldap=${openldap}"
|
||||||
|
"--with-sqlite3=${sqlite}"
|
||||||
|
"--without-x"
|
||||||
|
];
|
||||||
|
# dont succeed with --libexec=$out/sbin, so
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/libexec/* $out/sbin/
|
||||||
|
rmdir $out/libexec
|
||||||
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl ];
|
propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl sqlite];
|
||||||
}
|
}
|
||||||
|
|||||||
18
pkgs/development/libraries/lcms2/default.nix
Normal file
18
pkgs/development/libraries/lcms2/default.nix
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{stdenv, fetchurl, libtiff, libjpeg, zlib}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "lcms2-2.0a";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sf/lcms/${name}.tar.gz";
|
||||||
|
sha256 = "0kq5imagri0l964nnj06f7xny2q7rwvzqpm8ibsqz5zm263ggskd";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ libtiff libjpeg zlib ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Color management engine";
|
||||||
|
homepage = http://www.littlecms.com/;
|
||||||
|
license = "MIT";
|
||||||
|
};
|
||||||
|
}
|
||||||
19
pkgs/development/libraries/libssh2/default.nix
Normal file
19
pkgs/development/libraries/libssh2/default.nix
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{stdenv, fetchurlBoot, openssl, zlib}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "libssh2-1.2.6";
|
||||||
|
|
||||||
|
src = fetchurlBoot {
|
||||||
|
url = "${meta.homepage}/download/${name}.tar.gz";
|
||||||
|
sha256 = "00f6hw972v7jd0rrdr6kx5cn7pa1spyx8xgc7vhjydksgsig3f8b";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ openssl zlib ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A client-side C library implementing the SSH2 protocol";
|
||||||
|
homepage = http://www.libssh2.org;
|
||||||
|
platforms = stdenv.lib.platforms.all;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||||
|
};
|
||||||
|
}
|
||||||
23
pkgs/development/libraries/phonon-backend-vlc/default.nix
Normal file
23
pkgs/development/libraries/phonon-backend-vlc/default.nix
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{ stdenv, fetchurl, qt47, vlc, automoc4, cmake }:
|
||||||
|
|
||||||
|
let
|
||||||
|
pn = "phonon-backend-vlc";
|
||||||
|
v = "0.2.0";
|
||||||
|
in
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "${pn}-${v}";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://kde/stable/${pn}/${v}/src/${pn}-${v}.tar.gz";
|
||||||
|
sha256 = "1sac7770vk0ppwbzl9nag387ks7sqmdnm7722kpzafhx1c2r7wsv";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ qt47 vlc cmake automoc4 ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "VideoLAN backend for Phonon multimedia framework";
|
||||||
|
inherit (qt47.meta) platforms;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||||
|
};
|
||||||
|
}
|
||||||
23
pkgs/development/libraries/sqlite/3.6.x.nix
Normal file
23
pkgs/development/libraries/sqlite/3.6.x.nix
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{ stdenv, fetchurl, readline ? null, ncurses ? null }:
|
||||||
|
|
||||||
|
assert readline != null -> ncurses != null;
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "sqlite-3.6.23";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz";
|
||||||
|
sha256 = "a5de9ec9273acabc6cb18235df802549c476410b09d58a206e02862b4dc303ae";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [readline ncurses];
|
||||||
|
configureFlags = "--enable-threadsafe";
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1";
|
||||||
|
NIX_CFLAGS_LINK = if readline != null then "-lncurses" else "";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.sqlite.org/;
|
||||||
|
description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -3,14 +3,15 @@
|
|||||||
assert readline != null -> ncurses != null;
|
assert readline != null -> ncurses != null;
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "sqlite-3.6.23";
|
name = "sqlite-3.7.0.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz";
|
url = "http://www.sqlite.org/sqlite-amalgamation-3.7.0.1.tar.gz";
|
||||||
sha256 = "a5de9ec9273acabc6cb18235df802549c476410b09d58a206e02862b4dc303ae";
|
sha256 = "0nx506wmp32l6sh2p82bd2fscak1b402fp86cxl3r9pfs1yvychj";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [readline ncurses];
|
buildInputs = [ readline ncurses ];
|
||||||
|
|
||||||
configureFlags = "--enable-threadsafe";
|
configureFlags = "--enable-threadsafe";
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1";
|
NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1";
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
{fetchurl, buildPerlPackage, DBI, sqlite}:
|
{fetchurl, buildPerlPackage, DBI, sqlite}:
|
||||||
|
|
||||||
buildPerlPackage rec {
|
buildPerlPackage rec {
|
||||||
name = "DBD-SQLite-1.25";
|
name = "DBD-SQLite-1.29";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
|
url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
|
||||||
sha256 = "17dd09jhf2kk33rqlsg74c1sb049qabmyh857alqc9fhffd1yb43";
|
sha256 = "0rq8f9avaxqbnjq2zpd2knz2wsn8qiffnbbphp7a3bakwhlxbl2i";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [DBI];
|
propagatedBuildInputs = [DBI];
|
||||||
|
|||||||
@ -1,39 +1,39 @@
|
|||||||
diff -rc DBD-SQLite-1.25-orig/Makefile.PL DBD-SQLite-1.25/Makefile.PL
|
diff -rc DBD-SQLite-1.29/Makefile.PL DBD-SQLite-1.29-new/Makefile.PL
|
||||||
*** DBD-SQLite-1.25-orig/Makefile.PL 2009-04-23 12:12:04.000000000 +0200
|
*** DBD-SQLite-1.29/Makefile.PL 2010-01-08 10:08:29.000000000 +0100
|
||||||
--- DBD-SQLite-1.25/Makefile.PL 2009-07-02 14:07:25.000000000 +0200
|
--- DBD-SQLite-1.29-new/Makefile.PL 2010-08-05 11:42:53.000000000 +0200
|
||||||
***************
|
***************
|
||||||
*** 79,85 ****
|
*** 123,129 ****
|
||||||
# Let's find out the full story first, so we can make an informed
|
# a system sqlite is also sophisticated enough to have a patching system
|
||||||
# decision to whether to do this. -- ADAMK
|
# that can change the if ( 0 ) to if ( 1 )
|
||||||
my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
|
my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
|
||||||
! if ( 0 ) {
|
! if ( 0 ) {
|
||||||
require File::Spec;
|
require File::Spec;
|
||||||
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
|
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
|
||||||
$sqlite_base =~ /=(.*)/;
|
$sqlite_base =~ /=(.*)/;
|
||||||
--- 79,85 ----
|
--- 123,129 ----
|
||||||
# Let's find out the full story first, so we can make an informed
|
# a system sqlite is also sophisticated enough to have a patching system
|
||||||
# decision to whether to do this. -- ADAMK
|
# that can change the if ( 0 ) to if ( 1 )
|
||||||
my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
|
my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
|
||||||
! if ( 1 ) {
|
! if ( 1 ) {
|
||||||
require File::Spec;
|
require File::Spec;
|
||||||
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
|
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
|
||||||
$sqlite_base =~ /=(.*)/;
|
$sqlite_base =~ /=(.*)/;
|
||||||
***************
|
***************
|
||||||
*** 141,148 ****
|
*** 184,191 ****
|
||||||
|
} else {
|
||||||
# Use always the bundled one.
|
# Always the bundled one.
|
||||||
# XXX: ... and this message should be more informative.
|
# XXX: ... and this message should be more informative.
|
||||||
! $force_local = 1;
|
! $sqlite_local = 1;
|
||||||
! print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
|
! print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
|
||||||
|
}
|
||||||
|
|
||||||
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
|
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
|
||||||
|
--- 184,191 ----
|
||||||
--- 141,148 ----
|
} else {
|
||||||
|
# Always the bundled one.
|
||||||
# Use always the bundled one.
|
|
||||||
# XXX: ... and this message should be more informative.
|
# XXX: ... and this message should be more informative.
|
||||||
! #$force_local = 1;
|
! # $sqlite_local = 1;
|
||||||
! #print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
|
! # print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
|
||||||
|
}
|
||||||
|
|
||||||
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
|
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "dmtcp";
|
pname = "dmtcp";
|
||||||
version = "1.1.4";
|
version = "1.1.8";
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/${pname}/${pname}_${version}.tar.gz";
|
url = "mirror://sourceforge/${pname}/${pname}_${version}.tar.gz";
|
||||||
sha256 = "0asqzndy4is285rmd1dw406ar3wkfaaw9ivyrmhx2w5lwf4gl7sk";
|
sha256 = "05klyml5maw3f5rxl3i20fqyvpmx69bh09h7a48y19q3r4nqd8f2";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ perl python ];
|
buildInputs = [ perl python ];
|
||||||
|
|||||||
@ -1,45 +0,0 @@
|
|||||||
{stdenv, fetchsvn, perl, python}:
|
|
||||||
|
|
||||||
# Perl and python are needed in order to run the test suite.
|
|
||||||
|
|
||||||
let
|
|
||||||
revision = "512";
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "dmtcp-devel-${revision}";
|
|
||||||
|
|
||||||
src = fetchsvn {
|
|
||||||
url = https://dmtcp.svn.sourceforge.net/svnroot/dmtcp/trunk;
|
|
||||||
rev = revision;
|
|
||||||
sha256 = "77d8fe7f39d661669a58c6bf789886a8b6c8186d68d2b95d8a8791efab2c03b7";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ perl python ];
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
preCheck = ''
|
|
||||||
substituteInPlace dmtcp/src/dmtcp_coordinator.cpp \
|
|
||||||
--replace /bin/bash /bin/sh
|
|
||||||
substituteInPlace utils/gdb-add-symbol-file \
|
|
||||||
--replace /bin/bash /bin/sh
|
|
||||||
substituteInPlace test/autotest.py \
|
|
||||||
--replace /usr/bin/env $(type -p env) \
|
|
||||||
--replace /bin/bash $(type -p bash) \
|
|
||||||
--replace /usr/bin/perl $(type -p perl) \
|
|
||||||
--replace /usr/bin/python $(type -p python)
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Distributed MultiThreaded Checkpointing";
|
|
||||||
longDescription = ''
|
|
||||||
DMTCP (Distributed MultiThreaded Checkpointing) is a tool to
|
|
||||||
transparently checkpointing the state of an arbitrary group of
|
|
||||||
programs spread across many machines and connected by sockets. It does
|
|
||||||
not modify the user's program or the operating system.
|
|
||||||
'';
|
|
||||||
homepage = http://dmtcp.sourceforge.net/;
|
|
||||||
license = "LGPL";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }:
|
|||||||
import ./generic.nix (
|
import ./generic.nix (
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
version = "2.6.27.48";
|
version = "2.6.27.49";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
||||||
sha256 = "0l3gyp7z6b2qs30s1xhj8lm1sd8cracz21ixcqpdgs7rspkagdfk";
|
sha256 = "09gnh26gs4bkaj9ib3c5cnmbgj3bhbw7g6b49hz0xrp067slyxai";
|
||||||
};
|
};
|
||||||
|
|
||||||
features.iwlwifi = true;
|
features.iwlwifi = true;
|
||||||
|
|||||||
@ -206,11 +206,11 @@ in
|
|||||||
import ./generic.nix (
|
import ./generic.nix (
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
version = "2.6.32.16";
|
version = "2.6.32.17";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
||||||
sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
|
sha256 = "12ingi7ml0cw7hjbpaq5mxl4nvi7683kma3d1z0pzrzdd9wngh1x";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = configWithPlatform stdenv.platform;
|
config = configWithPlatform stdenv.platform;
|
||||||
|
|||||||
@ -197,11 +197,11 @@ in
|
|||||||
import ./generic.nix (
|
import ./generic.nix (
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
version = "2.6.33.6";
|
version = "2.6.33.7";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
||||||
sha256 = "0s7lfm9b6i056gqlj1naqda5lwc540s05ws7m6i2a6s79zgw784i";
|
sha256 = "006shp6fkyzah02a33g1ch1x1svdlkl3kfp2b191c2vrrn6hgyim";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = configWithPlatform stdenv.platform;
|
config = configWithPlatform stdenv.platform;
|
||||||
|
|||||||
@ -194,11 +194,11 @@ in
|
|||||||
import ./generic.nix (
|
import ./generic.nix (
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
version = "2.6.34.1";
|
version = "2.6.34.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
||||||
sha256 = "0v78yvkwr100v7bnrkkabxmpv5hjg1ngrjbr5d0kkzsw4d7bmm5x";
|
sha256 = "1p1s35sffvsdfh5rd5jl8iyin0il690als0q75fszf0fx1bh63sr";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = configWithPlatform stdenv.platform;
|
config = configWithPlatform stdenv.platform;
|
||||||
|
|||||||
19
pkgs/os-specific/linux/pam_ccreds/default.nix
Normal file
19
pkgs/os-specific/linux/pam_ccreds/default.nix
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{stdenv, fetchurl, pam, openssl, db}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "pam_ccreds-10";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://www.padl.com/download/pam_ccreds.tgz";
|
||||||
|
sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz";
|
||||||
|
};
|
||||||
|
patchPhase = ''
|
||||||
|
sed 's/-o root -g root//' -i Makefile.in
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [pam openssl db];
|
||||||
|
meta = {
|
||||||
|
homepage = "http://www.padl.com/OSS/pam_ccreds.html";
|
||||||
|
description = "The pam_ccreds module provides the means for Linux workstations to locally authenticate using an enterprise identity when the network is unavailable.";
|
||||||
|
};
|
||||||
|
}
|
||||||
19
pkgs/os-specific/linux/pam_krb5/default.nix
Normal file
19
pkgs/os-specific/linux/pam_krb5/default.nix
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{stdenv, fetchurl, pam, kerberos}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "pam_krb5-2.3.11-1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = https://fedorahosted.org/releases/p/a/pam_krb5/pam_krb5-2.3.11-1.tar.gz;
|
||||||
|
sha256 = "1x6wgjzkfkx0h9a7wdgx0jwrdm15npbs79i510lk1n3fyx9lk4mq";
|
||||||
|
# url = http://archives.eyrie.org/software/kerberos/pam-krb5-4.2.tar.gz;
|
||||||
|
# sha256 = "0a0zyd4ddln8yf827qxbfqi1pryxnj0fykfz8lx6nxn2f9pqj1gv";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [pam kerberos];
|
||||||
|
meta = {
|
||||||
|
# homepage = "http://www.eyrie.org/~eagle/software/pam-krb5";
|
||||||
|
homepage = "https://fedorahosted.org/pam_krb5/";
|
||||||
|
description = "The pam_krb5 module allows PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC. It can optionally convert Kerberos 5 credentials to Kerberos IV credentials and/or use them to set up AFS tokens for a user's session.";
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -1,23 +1,20 @@
|
|||||||
{stdenv, fetchurl, nasm, perl}:
|
{ stdenv, fetchurl, nasm, perl }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "syslinux-4.02";
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "syslinux-3.35";
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://kernel/linux/utils/boot/syslinux/Old/syslinux-3.35.tar.bz2;
|
url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2";
|
||||||
sha256 = "16kf2zhd0c4m3ai9xcls2y0ggvajhmzk1g6mv6jrv8nskkg6w0l6";
|
sha256 = "0zrk6magnrfa7nmdk2rll7xaym9rapwqqgy0wdh3cfscjmcw9kwm";
|
||||||
};
|
};
|
||||||
buildInputs = [nasm perl];
|
|
||||||
|
|
||||||
preBuild = "
|
patches = [ ./perl-deps.patch ];
|
||||||
makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include)
|
|
||||||
|
|
||||||
# Really dirty hack to get syslinux to build without needing a GCC
|
buildInputs = [ nasm perl ];
|
||||||
# with 32-bit libraries and headers.
|
|
||||||
if test \"$system\" = x86_64-linux; then
|
preBuild =
|
||||||
substituteInPlace memdisk/Makefile \\
|
''
|
||||||
--replace 'all: memdisk e820test' 'all: memdisk'
|
substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
|
||||||
mkdir gnu
|
makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include DATADIR=$out/share MANDIR=$out/share/man PERL=perl)
|
||||||
touch gnu/stubs-32.h
|
'';
|
||||||
fi
|
|
||||||
";
|
|
||||||
}
|
}
|
||||||
|
|||||||
81
pkgs/os-specific/linux/syslinux/perl-deps.patch
Normal file
81
pkgs/os-specific/linux/syslinux/perl-deps.patch
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
http://git.ipxe.org/ipxe.git/commitdiff/719b498
|
||||||
|
|
||||||
|
diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios
|
||||||
|
--- syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios 2010-07-21 21:33:13.000000000 +0200
|
||||||
|
+++ syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios 2010-08-06 23:32:57.000000000 +0200
|
||||||
|
@@ -24,11 +24,11 @@
|
||||||
|
|
||||||
|
# Padding rules
|
||||||
|
#
|
||||||
|
-PAD_rom = $(PADIMG) --blksize=512 --byte=0xff $@
|
||||||
|
+PAD_rom = $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@
|
||||||
|
PAD_hrom = $(PAD_rom)
|
||||||
|
PAD_xrom = $(PAD_rom)
|
||||||
|
-PAD_dsk = $(PADIMG) --blksize=512 $@
|
||||||
|
-PAD_hd = $(PADIMG) --blksize=32768 $@
|
||||||
|
+PAD_dsk = $(PERL) $(PADIMG) --blksize=512 $@
|
||||||
|
+PAD_hd = $(PERL) $(PADIMG) --blksize=32768 $@
|
||||||
|
|
||||||
|
# rule to make a non-emulation ISO boot image
|
||||||
|
NON_AUTO_MEDIA += iso
|
||||||
|
diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile syslinux-4.02/gpxe/src/Makefile
|
||||||
|
--- syslinux-4.02-orig/gpxe/src/Makefile 2010-07-21 21:33:13.000000000 +0200
|
||||||
|
+++ syslinux-4.02/gpxe/src/Makefile 2010-08-06 23:31:15.000000000 +0200
|
||||||
|
@@ -31,12 +31,12 @@
|
||||||
|
OBJCOPY := $(CROSS_COMPILE)objcopy
|
||||||
|
NM := $(CROSS_COMPILE)nm
|
||||||
|
OBJDUMP := $(CROSS_COMPILE)objdump
|
||||||
|
-PARSEROM := $(PERL) ./util/parserom.pl
|
||||||
|
-MAKEROM := $(PERL) ./util/makerom.pl
|
||||||
|
-SYMCHECK := $(PERL) ./util/symcheck.pl
|
||||||
|
-SORTOBJDUMP := $(PERL) ./util/sortobjdump.pl
|
||||||
|
-PADIMG := $(PERL) ./util/padimg.pl
|
||||||
|
-LICENCE := $(PERL) ./util/licence.pl
|
||||||
|
+PARSEROM := ./util/parserom.pl
|
||||||
|
+MAKEROM := ./util/makerom.pl
|
||||||
|
+SYMCHECK := ./util/symcheck.pl
|
||||||
|
+SORTOBJDUMP := ./util/sortobjdump.pl
|
||||||
|
+PADIMG := ./util/padimg.pl
|
||||||
|
+LICENCE := ./util/licence.pl
|
||||||
|
NRV2B := ./util/nrv2b
|
||||||
|
ZBIN := ./util/zbin
|
||||||
|
ELF2EFI32 := ./util/elf2efi32
|
||||||
|
diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile.housekeeping syslinux-4.02/gpxe/src/Makefile.housekeeping
|
||||||
|
--- syslinux-4.02-orig/gpxe/src/Makefile.housekeeping 2010-07-21 21:33:13.000000000 +0200
|
||||||
|
+++ syslinux-4.02/gpxe/src/Makefile.housekeeping 2010-08-06 23:31:49.000000000 +0200
|
||||||
|
@@ -456,7 +456,7 @@
|
||||||
|
'\n$(2) : $$($(4)_DEPS)\n' \
|
||||||
|
'\nTAGS : $$($(4)_DEPS)\n' \
|
||||||
|
>> $(2)
|
||||||
|
- @$(PARSEROM) $(1) >> $(2)
|
||||||
|
+ @$(PERL) $(PARSEROM) $(1) >> $(2)
|
||||||
|
|
||||||
|
endef
|
||||||
|
|
||||||
|
@@ -657,7 +657,7 @@
|
||||||
|
$(QM)$(ECHO) " [LD] $@"
|
||||||
|
$(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \
|
||||||
|
-Map $(BIN)/$*.tmp.map
|
||||||
|
- $(Q)$(OBJDUMP) -ht $@ | $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
|
||||||
|
+ $(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
|
||||||
|
|
||||||
|
# Keep intermediate object file (useful for debugging)
|
||||||
|
.PRECIOUS : $(BIN)/%.tmp
|
||||||
|
@@ -714,7 +714,7 @@
|
||||||
|
echo "files are missing a licence declaration:" ;\
|
||||||
|
echo $(call unlicensed_deps_list,$<);\
|
||||||
|
exit 1,\
|
||||||
|
- $(LICENCE) $(call licence_list,$<))
|
||||||
|
+ $(PERL) $(LICENCE) $(call licence_list,$<))
|
||||||
|
|
||||||
|
# Extract compression information from intermediate object file
|
||||||
|
#
|
||||||
|
@@ -941,7 +941,7 @@
|
||||||
|
CLEANUP += $(BIN)/symtab
|
||||||
|
|
||||||
|
symcheck : $(SYMTAB)
|
||||||
|
- $(SYMCHECK) $<
|
||||||
|
+ $(PERL) $(SYMCHECK) $<
|
||||||
|
|
||||||
|
endif # defined(BIN)
|
||||||
|
|
||||||
@ -1,6 +1,8 @@
|
|||||||
{stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl}:
|
{ stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl
|
||||||
|
, coreutils, findutils, gnused, gnugrep
|
||||||
|
}:
|
||||||
|
|
||||||
assert stdenv.isLinux && stdenv ? coreutils;
|
assert stdenv.isLinux;
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "postfix-2.2.11";
|
name = "postfix-2.2.11";
|
||||||
@ -24,8 +26,8 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
mkdir $out/share/postfix/conf
|
mkdir $out/share/postfix/conf
|
||||||
cp conf/* $out/share/postfix/conf
|
cp conf/* $out/share/postfix/conf
|
||||||
sed -e 's@PATH=.*@PATH=${stdenv.coreutils}/bin:${stdenv.findutils}/bin:${stdenv.gnused}/bin:${stdenv.gnugrep}/bin:$out/sbin@' -i $out/share/postfix/conf/post-install
|
sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin@' -i $out/share/postfix/conf/post-install
|
||||||
sed -e '2aPATH=${stdenv.coreutils}/bin:${stdenv.findutils}/bin:${stdenv.gnused}/bin:${stdenv.gnugrep}/bin:$out/sbin' -i $out/share/postfix/conf/postfix-script
|
sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin' -i $out/share/postfix/conf/postfix-script
|
||||||
chmod a+x $out/share/postfix/conf/{postfix-script,post-install}
|
chmod a+x $out/share/postfix/conf/{postfix-script,post-install}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,5 @@
|
|||||||
{ stdenv, fetchurl, libxml2, openssl, readline, gawk }:
|
{ stdenv, fetchurl, libxml2, openssl, readline, gawk }:
|
||||||
|
|
||||||
assert stdenv ? gawk || gawk != null;
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "virtuoso-opensource-6.1.1";
|
name = "virtuoso-opensource-6.1.1";
|
||||||
|
|
||||||
@ -10,8 +8,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1sd70j9i26ml16lig9r9lmrdf5q0kybq71r6vzzzc5v5jxjz0l7w";
|
sha256 = "1sd70j9i26ml16lig9r9lmrdf5q0kybq71r6vzzzc5v5jxjz0l7w";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libxml2 openssl readline ]
|
buildInputs = [ libxml2 openssl readline gawk ];
|
||||||
++ stdenv.lib.optional (! stdenv ? gawk) gawk;
|
|
||||||
|
|
||||||
CPP="${stdenv.gcc}/bin/gcc -E";
|
CPP="${stdenv.gcc}/bin/gcc -E";
|
||||||
|
|
||||||
|
|||||||
@ -15,7 +15,7 @@ rec {
|
|||||||
|
|
||||||
|
|
||||||
# Add some arbitrary packages to buildInputs for specific packages.
|
# Add some arbitrary packages to buildInputs for specific packages.
|
||||||
# Used to override packages in stenv like Make. Should not be used
|
# Used to override packages in stdenv like Make. Should not be used
|
||||||
# for other dependencies.
|
# for other dependencies.
|
||||||
overrideInStdenv = stdenv: pkgs: stdenv //
|
overrideInStdenv = stdenv: pkgs: stdenv //
|
||||||
{ mkDerivation = args: stdenv.mkDerivation (args //
|
{ mkDerivation = args: stdenv.mkDerivation (args //
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{ system, name, preHook ? null, postHook ? null, initialPath, gcc, shell
|
{ system, name, preHook ? null, postHook ? null, initialPath, gcc, shell
|
||||||
, param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? ""
|
, param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? ""
|
||||||
, extraAttrs ? {}
|
, extraAttrs ? {}, overrides ? {}
|
||||||
|
|
||||||
, # The `fetchurl' to use for downloading curl and its dependencies
|
, # The `fetchurl' to use for downloading curl and its dependencies
|
||||||
# (see all-packages.nix).
|
# (see all-packages.nix).
|
||||||
@ -97,6 +97,7 @@ let
|
|||||||
|| result.system == "armv5tel-linux"
|
|| result.system == "armv5tel-linux"
|
||||||
|| result.system == "ict_loongson-2_v0.3_fpu_v0.1-linux";
|
|| result.system == "ict_loongson-2_v0.3_fpu_v0.1-linux";
|
||||||
isSunOS = result.system == "i386-sunos";
|
isSunOS = result.system == "i386-sunos";
|
||||||
|
isSunOS = result.system == "i386-sunos";
|
||||||
isi686 = result.system == "i686-linux"
|
isi686 = result.system == "i686-linux"
|
||||||
|| result.system == "i686-darwin"
|
|| result.system == "i686-darwin"
|
||||||
|| result.system == "i686-freebsd"
|
|| result.system == "i686-freebsd"
|
||||||
@ -120,6 +121,7 @@ let
|
|||||||
|
|
||||||
inherit fetchurlBoot;
|
inherit fetchurlBoot;
|
||||||
|
|
||||||
|
inherit overrides;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Propagate any extra attributes. For instance, we use this to
|
# Propagate any extra attributes. For instance, we use this to
|
||||||
|
|||||||
@ -74,7 +74,7 @@ rec {
|
|||||||
# This function builds the various standard environments used during
|
# This function builds the various standard environments used during
|
||||||
# the bootstrap.
|
# the bootstrap.
|
||||||
stdenvBootFun =
|
stdenvBootFun =
|
||||||
{gcc, extraAttrs ? {}, extraPath ? [], fetchurl}:
|
{gcc, extraAttrs ? {}, overrides ? {}, extraPath ? [], fetchurl}:
|
||||||
|
|
||||||
import ../generic {
|
import ../generic {
|
||||||
inherit system;
|
inherit system;
|
||||||
@ -90,8 +90,10 @@ rec {
|
|||||||
shell = "${bootstrapTools}/bin/sh";
|
shell = "${bootstrapTools}/bin/sh";
|
||||||
initialPath = [bootstrapTools] ++ extraPath;
|
initialPath = [bootstrapTools] ++ extraPath;
|
||||||
fetchurlBoot = fetchurl;
|
fetchurlBoot = fetchurl;
|
||||||
inherit gcc;
|
inherit gcc extraAttrs;
|
||||||
extraAttrs = extraAttrs // {inherit fetchurl;};
|
overrides = overrides // {
|
||||||
|
inherit fetchurl;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Build a dummy stdenv with no GCC or working fetchurl. This is
|
# Build a dummy stdenv with no GCC or working fetchurl. This is
|
||||||
@ -169,7 +171,7 @@ rec {
|
|||||||
coreutils = bootstrapTools;
|
coreutils = bootstrapTools;
|
||||||
libc = stdenvLinuxGlibc;
|
libc = stdenvLinuxGlibc;
|
||||||
};
|
};
|
||||||
extraAttrs = {
|
overrides = {
|
||||||
glibc = stdenvLinuxGlibc;
|
glibc = stdenvLinuxGlibc;
|
||||||
inherit (stdenvLinuxBoot1Pkgs) perl;
|
inherit (stdenvLinuxBoot1Pkgs) perl;
|
||||||
};
|
};
|
||||||
@ -208,7 +210,7 @@ rec {
|
|||||||
gcc = gccWithStaticLibs;
|
gcc = gccWithStaticLibs;
|
||||||
name = "";
|
name = "";
|
||||||
};
|
};
|
||||||
extraAttrs = {
|
overrides = {
|
||||||
inherit (stdenvLinuxBoot1Pkgs) perl;
|
inherit (stdenvLinuxBoot1Pkgs) perl;
|
||||||
};
|
};
|
||||||
inherit fetchurl;
|
inherit fetchurl;
|
||||||
@ -228,7 +230,7 @@ rec {
|
|||||||
#
|
#
|
||||||
# When updating stdenvLinux, make sure that the result has no
|
# When updating stdenvLinux, make sure that the result has no
|
||||||
# dependency (`nix-store -qR') on bootstrapTools.
|
# dependency (`nix-store -qR') on bootstrapTools.
|
||||||
stdenvLinux = import ../generic {
|
stdenvLinux = import ../generic rec {
|
||||||
name = "stdenv-linux";
|
name = "stdenv-linux";
|
||||||
|
|
||||||
inherit system;
|
inherit system;
|
||||||
@ -253,10 +255,15 @@ rec {
|
|||||||
fetchurlBoot = fetchurl;
|
fetchurlBoot = fetchurl;
|
||||||
|
|
||||||
extraAttrs = {
|
extraAttrs = {
|
||||||
inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc;
|
inherit (stdenvLinuxBoot2Pkgs) glibc;
|
||||||
|
};
|
||||||
|
|
||||||
|
overrides = {
|
||||||
|
inherit gcc;
|
||||||
|
inherit (stdenvLinuxBoot2Pkgs) binutils glibc;
|
||||||
inherit (stdenvLinuxBoot3Pkgs)
|
inherit (stdenvLinuxBoot3Pkgs)
|
||||||
gzip bzip2 bash coreutils diffutils findutils gawk
|
gzip bzip2 bash coreutils diffutils findutils gawk
|
||||||
gnumake gnused gnutar gnugrep patch patchelf
|
gnumake gnused gnutar gnugrep gnupatch patchelf
|
||||||
attr acl;
|
attr acl;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@ -6,7 +6,7 @@ let {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Initial standard environment based on native Cygwin tools.
|
* Initial standard environment based on native Cygwin tools.
|
||||||
* GCC is not requires.
|
* GCC is not required.
|
||||||
* Required (approx): bash, mkdir, gnu tar, curl.
|
* Required (approx): bash, mkdir, gnu tar, curl.
|
||||||
*/
|
*/
|
||||||
stdenvInit1 =
|
stdenvInit1 =
|
||||||
@ -62,7 +62,7 @@ let {
|
|||||||
body =
|
body =
|
||||||
stdenv // mkDerivationFun // {
|
stdenv // mkDerivationFun // {
|
||||||
inherit fetchurl;
|
inherit fetchurl;
|
||||||
pkgconfig = pkgconfigBin;
|
overrides.pkgconfig = pkgconfigBin;
|
||||||
};
|
};
|
||||||
|
|
||||||
shell =
|
shell =
|
||||||
|
|||||||
@ -1,45 +1,24 @@
|
|||||||
{stdenv, fetchurl}:
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation {
|
||||||
name = "cpio-2.11";
|
name = "cpio-2.9";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
|
url = mirror://gnu/cpio/cpio-2.9.tar.bz2;
|
||||||
sha256 = "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv";
|
sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Tests fail on Darwin, see
|
patches = [
|
||||||
# <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00012.html> for
|
# Make it compile on GCC 4.3.
|
||||||
# details.
|
(fetchurl {
|
||||||
doCheck = !stdenv.isDarwin;
|
name = "cpio-2.9-gnu-inline.patch";
|
||||||
|
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/cpio/files/cpio-2.9-gnu-inline.patch?rev=1.1";
|
||||||
|
sha256 = "1167hrq64h9lh3qhgasm2rivfzkkgx6fik92b017qfa0q61ff8c3";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/cpio/;
|
homepage = http://www.gnu.org/software/cpio/;
|
||||||
description = "GNU cpio, a program to create or extract from cpio archives";
|
description = "A program to create or extract from cpio archives";
|
||||||
|
|
||||||
longDescription =
|
|
||||||
'' GNU cpio copies files into or out of a cpio or tar archive. The
|
|
||||||
archive can be another file on the disk, a magnetic tape, or a pipe.
|
|
||||||
|
|
||||||
GNU cpio supports the following archive formats: binary, old ASCII,
|
|
||||||
new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1
|
|
||||||
tar. The tar format is provided for compatability with the tar
|
|
||||||
program. By default, cpio creates binary format archives, for
|
|
||||||
compatibility with older cpio programs. When extracting from
|
|
||||||
archives, cpio automatically recognizes which kind of archive it is
|
|
||||||
reading and can read archives created on machines with a different
|
|
||||||
byte-order.
|
|
||||||
'';
|
|
||||||
|
|
||||||
license = "GPLv3+";
|
|
||||||
|
|
||||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
|
||||||
platforms = stdenv.lib.platforms.all;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
(if stdenv.isLinux
|
|
||||||
then {}
|
|
||||||
else { patches = [ ./darwin-fix.patch ]; }))
|
|
||||||
|
|||||||
45
pkgs/tools/archivers/cpio/latest.nix
Normal file
45
pkgs/tools/archivers/cpio/latest.nix
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation ({
|
||||||
|
name = "cpio-2.11";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
|
||||||
|
sha256 = "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Tests fail on Darwin, see
|
||||||
|
# <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00012.html> for
|
||||||
|
# details.
|
||||||
|
doCheck = !stdenv.isDarwin;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.gnu.org/software/cpio/;
|
||||||
|
description = "GNU cpio, a program to create or extract from cpio archives";
|
||||||
|
|
||||||
|
longDescription =
|
||||||
|
'' GNU cpio copies files into or out of a cpio or tar archive. The
|
||||||
|
archive can be another file on the disk, a magnetic tape, or a pipe.
|
||||||
|
|
||||||
|
GNU cpio supports the following archive formats: binary, old ASCII,
|
||||||
|
new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1
|
||||||
|
tar. The tar format is provided for compatability with the tar
|
||||||
|
program. By default, cpio creates binary format archives, for
|
||||||
|
compatibility with older cpio programs. When extracting from
|
||||||
|
archives, cpio automatically recognizes which kind of archive it is
|
||||||
|
reading and can read archives created on machines with a different
|
||||||
|
byte-order.
|
||||||
|
'';
|
||||||
|
|
||||||
|
license = "GPLv3+";
|
||||||
|
|
||||||
|
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||||
|
platforms = stdenv.lib.platforms.all;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
|
||||||
|
(if stdenv.isLinux
|
||||||
|
then {}
|
||||||
|
else { patches = [ ./darwin-fix.patch ]; }))
|
||||||
@ -1,16 +1,17 @@
|
|||||||
{stdenv, fetchurl}:
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "p7zip-9.04";
|
name = "p7zip-9.13";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://sourceforge/p7zip/p7zip_9.04_src_all.tar.bz2;
|
url = mirror://sourceforge/p7zip/p7zip_9.13_src_all.tar.bz2;
|
||||||
sha256 = "1azr73vlj602hl6siagnqd1rn8sw73lny292jqgspg0lb9wvdyyx";
|
sha256 = "08yr0cfbjx60r1ia7vhphzvc3gax62xhgsn3vdm7sdmxxai0z77w";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure =
|
preConfigure =
|
||||||
''
|
''
|
||||||
makeFlagsArray=(DEST_HOME=$out)
|
makeFlagsArray=(DEST_HOME=$out)
|
||||||
|
buildFlags=all3
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|||||||
62
pkgs/tools/cd-dvd/unetbootin/default.nix
Normal file
62
pkgs/tools/cd-dvd/unetbootin/default.nix
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
|
||||||
|
|
||||||
|
let version = "485"; in
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "unetbootin-${version}";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
|
||||||
|
sha256 = "1nyzy1wrql0l6zkmrd1l3qqvbdkv0534axdz6vy3cyksp157jxc8";
|
||||||
|
};
|
||||||
|
|
||||||
|
sourceRoot = ".";
|
||||||
|
|
||||||
|
buildInputs = [ makeWrapper qt4 ];
|
||||||
|
|
||||||
|
# Lots of nice hard-coded paths...
|
||||||
|
postUnpack =
|
||||||
|
''
|
||||||
|
substituteInPlace unetbootin.cpp \
|
||||||
|
--replace /sbin/fdisk ${utillinux}/sbin/fdisk \
|
||||||
|
--replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
|
||||||
|
--replace /sbin/blkid ${utillinux}/sbin/blkid \
|
||||||
|
--replace /bin/df ${coreutils}/bin/df \
|
||||||
|
--replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
|
||||||
|
--replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
|
||||||
|
--replace /usr/share/syslinux ${syslinux}/share/syslinux
|
||||||
|
substituteInPlace main.cpp \
|
||||||
|
--replace /usr/share/unetbootin $out/share/unetbootin
|
||||||
|
substituteInPlace unetbootin.desktop \
|
||||||
|
--replace /usr/bin $out/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildPhase =
|
||||||
|
''
|
||||||
|
lupdate unetbootin.pro
|
||||||
|
lrelease unetbootin.pro
|
||||||
|
qmake
|
||||||
|
make
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase =
|
||||||
|
''
|
||||||
|
ensureDir $out/bin
|
||||||
|
cp unetbootin $out/bin
|
||||||
|
|
||||||
|
ensureDir $out/share/unetbootin
|
||||||
|
cp unetbootin_*.qm $out/share/unetbootin
|
||||||
|
|
||||||
|
ensureDir $out/share/applications
|
||||||
|
cp unetbootin.desktop $out/share/applications
|
||||||
|
|
||||||
|
wrapProgram $out/bin/unetbootin \
|
||||||
|
--prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://unetbootin.sourceforge.net/;
|
||||||
|
description = "A tool to create bootable live USB drives from ISO images";
|
||||||
|
license = "GPLv2+";
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -1,24 +1,18 @@
|
|||||||
{builderDefs}: with builderDefs;
|
{ stdenv, fetchurl }:
|
||||||
let localDefs = builderDefs.passthru.function (rec {
|
|
||||||
src = /* put a fetchurl here */
|
stdenv.mkDerivation rec {
|
||||||
fetchurl {
|
name = "dosfstools-3.0.9";
|
||||||
url = http://www.daniel-baumann.ch/software/dosfstools/dosfstools-3.0.1.tar.bz2;
|
|
||||||
sha256 = "7fab0de42391277028071d01ff4da83ff9a399408ccf29958cdee62ffe746d45";
|
src = fetchurl {
|
||||||
|
url = "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2";
|
||||||
|
sha256 = "13s5s0hvhmn7r4ppqmw8nqgdm5v5vc6r5j44kn87wl5cmrpnfqrz";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [];
|
makeFlags = "PREFIX=$(out)";
|
||||||
configureFlags = [];
|
|
||||||
makeFlags = " PREFIX=$out ";
|
|
||||||
});
|
|
||||||
in with localDefs;
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "dosfstools-3.01";
|
|
||||||
builder = writeScript (name + "-builder")
|
|
||||||
(textClosure localDefs
|
|
||||||
["doMakeInstall" doForceShare doPropagate]);
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Dosfstools - utilities for vfat file system.";
|
description = "Utilities for creating and checking FAT and VFAT file systems";
|
||||||
homepage = "http://www.daniel-baumann.ch/software/dosfstools/";
|
homepage = http://www.daniel-baumann.ch/software/dosfstools/;
|
||||||
inherit src;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
17
pkgs/tools/filesystems/mtools/default.nix
Normal file
17
pkgs/tools/filesystems/mtools/default.nix
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{ stdenv, fetchurl, texinfo }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "mtools-4.0.13";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnu/mtools/${name}.tar.bz2";
|
||||||
|
sha256 = "1nj7lc2q1g66l3ma8z1c95nglf9himnr6k85b5rry99f9za7npbg";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ texinfo ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.gnu.org/software/mtools/;
|
||||||
|
description = "Utilities to access MS-DOS disks without mounting them";
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -1,9 +1,9 @@
|
|||||||
rec {
|
rec {
|
||||||
version="1.96";
|
version="2.03";
|
||||||
name="asymptote-1.96";
|
name="asymptote-2.03";
|
||||||
hash="0rs2h77j3nq36w0vr131yvlp8lqsanidhf9fvd4bggz5j5r8r850";
|
hash="1npj9igf4b9dy1frriqc20ihm1s0f3yw2pgs0xc4rv514rp0wkpx";
|
||||||
url="http://downloads.sourceforge.net/project/asymptote/asymptote/${version}/asymptote-${version}.src.tgz";
|
url="http://downloads.sourceforge.net/project/asymptote/asymptote/${version}/asymptote-${version}.src.tgz";
|
||||||
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/asymptote/1.96/asymptote-1.96.src.tgz";
|
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/asymptote/2.03/asymptote-2.03.src.tgz";
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,11 +1,13 @@
|
|||||||
{ stdenv, fetchurl
|
{ stdenv, fetchurl
|
||||||
, zlibSupport ? false, zlib ? null
|
, zlibSupport ? false, zlib
|
||||||
, sslSupport ? false, openssl ? null
|
, sslSupport ? false, openssl
|
||||||
|
, scpSupport ? false, libssh2
|
||||||
, linkStatic ? false
|
, linkStatic ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert zlibSupport -> zlib != null;
|
assert zlibSupport -> zlib != null;
|
||||||
assert sslSupport -> openssl != null;
|
assert sslSupport -> openssl != null;
|
||||||
|
assert scpSupport -> libssh2 != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "curl-7.21.0";
|
name = "curl-7.21.0";
|
||||||
@ -24,6 +26,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configureFlags = ''
|
configureFlags = ''
|
||||||
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
|
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
|
||||||
|
${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"}
|
||||||
${if linkStatic then "--enable-static --disable-shared" else ""}
|
${if linkStatic then "--enable-static --disable-shared" else ""}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper }:
|
{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper, coreutils, gnused }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "dhcp-4.1.1-P1";
|
name = "dhcp-4.1.1-P1";
|
||||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||||||
substituteInPlace $out/sbin/dhclient-script \
|
substituteInPlace $out/sbin/dhclient-script \
|
||||||
--replace /sbin/ip ${iproute}/sbin/ip
|
--replace /sbin/ip ${iproute}/sbin/ip
|
||||||
wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
|
wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
|
||||||
"${nettools}/bin:${nettools}/sbin:${iputils}/bin:${stdenv.coreutils}/bin:${stdenv.gnused}/bin"
|
"${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure =
|
preConfigure =
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
{stdenv, fetchurl, pkgconfig, glib}:
|
{stdenv, fetchurl, pkgconfig, glib}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "nbd-2.9.15";
|
name = "nbd-2.9.17";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/nbd/${name}.tar.bz2";
|
url = "mirror://sourceforge/nbd/${name}.tar.bz2";
|
||||||
sha256 = "26e2ef18cc2f214d666eef1cfb31df1ba8ee6eaa78390afd6d18f2cce9c0c704";
|
sha256 = "07423fba4b1a6d394008505b86fe41d1978956035f49c1197de648fbaa7fb7ff";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [pkgconfig glib];
|
buildInputs = [pkgconfig glib];
|
||||||
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
|||||||
description = "map arbitrary files as block devices over the network";
|
description = "map arbitrary files as block devices over the network";
|
||||||
license = "GPLv2";
|
license = "GPLv2";
|
||||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||||
platforms = stdenv.lib.platforms.gnu;
|
platforms = stdenv.lib.platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,11 +4,11 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "nix-0.16pre22378";
|
name = "nix-0.16pre22953";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://hydra.nixos.org/build/467032/download/4/${name}.tar.bz2";
|
url = "http://hydra.nixos.org/build/527157/download/4/${name}.tar.bz2";
|
||||||
sha256 = "1bd3645da0bc03b70e4b0d687c6c0868bb1522b01b6acf4af858556f8f21ee57";
|
sha256 = "7fe185f49bda5281274b203467d206a6a76a762f742a93adeca71ba63470f71e";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ perl curl openssl ];
|
buildInputs = [ perl curl openssl ];
|
||||||
|
|||||||
@ -93,10 +93,11 @@ let
|
|||||||
# (un-overriden) set of packages, allowing packageOverrides
|
# (un-overriden) set of packages, allowing packageOverrides
|
||||||
# attributes to refer to the original attributes (e.g. "foo =
|
# attributes to refer to the original attributes (e.g. "foo =
|
||||||
# ... pkgs.foo ...").
|
# ... pkgs.foo ...").
|
||||||
__overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig;
|
overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig //
|
||||||
|
(if pkgsOrig.stdenv ? overrides then pkgsOrig.stdenv.overrides else { });
|
||||||
|
|
||||||
pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides
|
pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides
|
||||||
pkgs = pkgsFun __overrides; # the overriden, final packages
|
pkgs = pkgsFun overrides; # the overriden, final packages
|
||||||
|
|
||||||
|
|
||||||
# We use `callPackage' to be able to omit function arguments that
|
# We use `callPackage' to be able to omit function arguments that
|
||||||
@ -113,6 +114,7 @@ let
|
|||||||
# The package compositions. Yes, this isn't properly indented.
|
# The package compositions. Yes, this isn't properly indented.
|
||||||
pkgsFun = __overrides: with helperFunctions; helperFunctions // rec {
|
pkgsFun = __overrides: with helperFunctions; helperFunctions // rec {
|
||||||
|
|
||||||
|
|
||||||
# Override system. This is useful to build i686 packages on x86_64-linux.
|
# Override system. This is useful to build i686 packages on x86_64-linux.
|
||||||
forceSystem = system: (import ./all-packages.nix) {
|
forceSystem = system: (import ./all-packages.nix) {
|
||||||
inherit system;
|
inherit system;
|
||||||
@ -152,10 +154,6 @@ let
|
|||||||
# inside the set for derivations.
|
# inside the set for derivations.
|
||||||
recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;};
|
recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;};
|
||||||
|
|
||||||
useFromStdenv = it : alternative : if ((bootStdenv != null ||
|
|
||||||
crossSystem == null) && builtins.hasAttr it stdenv) then
|
|
||||||
(builtins.getAttr it stdenv) else alternative;
|
|
||||||
|
|
||||||
# Return the first available value in the order: pkg.val, val, or default.
|
# Return the first available value in the order: pkg.val, val, or default.
|
||||||
getPkgConfig = pkg : val : default : (getConfig [ pkg val ] (getConfig [ val ] default));
|
getPkgConfig = pkg : val : default : (getConfig [ pkg val ] (getConfig [ val ] default));
|
||||||
|
|
||||||
@ -265,15 +263,10 @@ let
|
|||||||
inherit stdenv mercurial nix;
|
inherit stdenv mercurial nix;
|
||||||
};
|
};
|
||||||
|
|
||||||
# `fetchurl' downloads a file from the network. The `useFromStdenv'
|
# `fetchurl' downloads a file from the network.
|
||||||
# is there to allow stdenv to determine fetchurl. Used during the
|
fetchurl = import ../build-support/fetchurl {
|
||||||
# stdenv-linux bootstrap phases to prevent lots of different curls
|
inherit curl stdenv;
|
||||||
# from being built.
|
};
|
||||||
fetchurl = useFromStdenv "fetchurl"
|
|
||||||
(import ../build-support/fetchurl {
|
|
||||||
curl = curl;
|
|
||||||
stdenv = stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
# fetchurlBoot is used for curl and its dependencies in order to
|
# fetchurlBoot is used for curl and its dependencies in order to
|
||||||
# prevent a cyclic dependency (curl depends on curl.tar.bz2,
|
# prevent a cyclic dependency (curl depends on curl.tar.bz2,
|
||||||
@ -428,10 +421,7 @@ let
|
|||||||
|
|
||||||
bsdiff = callPackage ../tools/compression/bsdiff { };
|
bsdiff = callPackage ../tools/compression/bsdiff { };
|
||||||
|
|
||||||
bzip2 = useFromStdenv "bzip2"
|
bzip2 = callPackage ../tools/compression/bzip2 { };
|
||||||
(import ../tools/compression/bzip2 {
|
|
||||||
inherit fetchurl stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
cabextract = callPackage ../tools/archivers/cabextract { };
|
cabextract = callPackage ../tools/archivers/cabextract { };
|
||||||
|
|
||||||
@ -469,18 +459,14 @@ let
|
|||||||
|
|
||||||
convmv = callPackage ../tools/misc/convmv { };
|
convmv = callPackage ../tools/misc/convmv { };
|
||||||
|
|
||||||
coreutils_real = makeOverridable (if stdenv ? isDietLibC
|
coreutils = callPackage (if stdenv ? isDietLibC
|
||||||
then import ../tools/misc/coreutils-5
|
then ../tools/misc/coreutils-5
|
||||||
else import ../tools/misc/coreutils)
|
else ../tools/misc/coreutils)
|
||||||
{
|
{
|
||||||
inherit fetchurl stdenv acl perl gmp;
|
|
||||||
|
|
||||||
# TODO: Add ACL support for cross-Linux.
|
# TODO: Add ACL support for cross-Linux.
|
||||||
aclSupport = (crossSystem == null) && stdenv.isLinux;
|
aclSupport = crossSystem == null && stdenv.isLinux;
|
||||||
};
|
};
|
||||||
|
|
||||||
coreutils = useFromStdenv "coreutils" coreutils_real;
|
|
||||||
|
|
||||||
cpio = callPackage ../tools/archivers/cpio { };
|
cpio = callPackage ../tools/archivers/cpio { };
|
||||||
|
|
||||||
cromfs = callPackage ../tools/archivers/cromfs { };
|
cromfs = callPackage ../tools/archivers/cromfs { };
|
||||||
@ -488,11 +474,12 @@ let
|
|||||||
cron = callPackage ../tools/system/cron { # see also fcron
|
cron = callPackage ../tools/system/cron { # see also fcron
|
||||||
};
|
};
|
||||||
|
|
||||||
curl = makeOverridable (import ../tools/networking/curl) {
|
curl = makeOverridable (import ../tools/networking/curl) rec {
|
||||||
fetchurl = fetchurlBoot;
|
fetchurl = fetchurlBoot;
|
||||||
inherit stdenv zlib openssl;
|
inherit stdenv zlib openssl libssh2;
|
||||||
zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
|
zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
|
||||||
sslSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
|
sslSupport = zlibSupport;
|
||||||
|
scpSupport = zlibSupport && (!stdenv.isSunOS);
|
||||||
};
|
};
|
||||||
|
|
||||||
curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
|
curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
|
||||||
@ -528,10 +515,7 @@ let
|
|||||||
|
|
||||||
diffstat = callPackage ../tools/text/diffstat { };
|
diffstat = callPackage ../tools/text/diffstat { };
|
||||||
|
|
||||||
diffutils = useFromStdenv "diffutils"
|
diffutils = callPackage ../tools/text/diffutils { };
|
||||||
(import ../tools/text/diffutils {
|
|
||||||
inherit fetchurl stdenv coreutils;
|
|
||||||
});
|
|
||||||
|
|
||||||
dirmngr = callPackage ../tools/security/dirmngr { };
|
dirmngr = callPackage ../tools/security/dirmngr { };
|
||||||
|
|
||||||
@ -589,12 +573,10 @@ let
|
|||||||
|
|
||||||
file = callPackage ../tools/misc/file { };
|
file = callPackage ../tools/misc/file { };
|
||||||
|
|
||||||
findutils = useFromStdenv "findutils"
|
findutils =
|
||||||
(if stdenv.isDarwin then findutils4227 else
|
if stdenv.isDarwin
|
||||||
import ../tools/misc/findutils {
|
then findutils4227
|
||||||
inherit fetchurl stdenv coreutils;
|
else callPackage ../tools/misc/findutils { };
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
findutils4227 = callPackage ../tools/misc/findutils/4.2.27.nix { };
|
findutils4227 = callPackage ../tools/misc/findutils/4.2.27.nix { };
|
||||||
|
|
||||||
@ -610,10 +592,7 @@ let
|
|||||||
|
|
||||||
unix2dos = callPackage ../tools/text/unix2dos { };
|
unix2dos = callPackage ../tools/text/unix2dos { };
|
||||||
|
|
||||||
gawk = useFromStdenv "gawk"
|
gawk = callPackage ../tools/text/gawk { };
|
||||||
(import ../tools/text/gawk {
|
|
||||||
inherit fetchurl stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
gdmap = callPackage ../tools/system/gdmap {
|
gdmap = callPackage ../tools/system/gdmap {
|
||||||
inherit (gtkLibs216) gtk;
|
inherit (gtkLibs216) gtk;
|
||||||
@ -644,14 +623,9 @@ let
|
|||||||
inherit (gtkLibs) glib;
|
inherit (gtkLibs) glib;
|
||||||
};
|
};
|
||||||
|
|
||||||
gnugrep = useFromStdenv "gnugrep"
|
gnugrep = callPackage ../tools/text/gnugrep { };
|
||||||
(import ../tools/text/gnugrep {
|
|
||||||
inherit fetchurl stdenv pcre;
|
|
||||||
});
|
|
||||||
|
|
||||||
gnupatch = useFromStdenv "patch" (import ../tools/text/gnupatch {
|
gnupatch = callPackage ../tools/text/gnupatch { };
|
||||||
inherit fetchurl stdenv ed;
|
|
||||||
});
|
|
||||||
|
|
||||||
gnupg1orig = callPackage ../tools/security/gnupg1 {
|
gnupg1orig = callPackage ../tools/security/gnupg1 {
|
||||||
ideaSupport = false;
|
ideaSupport = false;
|
||||||
@ -670,17 +644,11 @@ let
|
|||||||
lua = null;
|
lua = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
gnused = useFromStdenv "gnused"
|
gnused = callPackage ../tools/text/gnused { };
|
||||||
(import ../tools/text/gnused {
|
|
||||||
inherit fetchurl stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
gnused_4_2 = callPackage ../tools/text/gnused/4.2.nix { };
|
gnused_4_2 = callPackage ../tools/text/gnused/4.2.nix { };
|
||||||
|
|
||||||
gnutar = useFromStdenv "gnutar"
|
gnutar = callPackage ../tools/archivers/gnutar { };
|
||||||
(import ../tools/archivers/gnutar {
|
|
||||||
inherit fetchurl stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
gnuvd = callPackage ../tools/misc/gnuvd { };
|
gnuvd = callPackage ../tools/misc/gnuvd { };
|
||||||
|
|
||||||
@ -730,10 +698,7 @@ let
|
|||||||
inherit openssl gmp nettools iproute;
|
inherit openssl gmp nettools iproute;
|
||||||
};
|
};
|
||||||
|
|
||||||
gzip = useFromStdenv "gzip"
|
gzip = callPackage ../tools/compression/gzip { };
|
||||||
(import ../tools/compression/gzip {
|
|
||||||
inherit fetchurl stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
pigz = callPackage ../tools/compression/pigz { };
|
pigz = callPackage ../tools/compression/pigz { };
|
||||||
|
|
||||||
@ -861,6 +826,8 @@ let
|
|||||||
|
|
||||||
mtdutils = callPackage ../tools/filesystems/mtdutils { };
|
mtdutils = callPackage ../tools/filesystems/mtdutils { };
|
||||||
|
|
||||||
|
mtools = callPackage ../tools/filesystems/mtools { };
|
||||||
|
|
||||||
multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec {
|
multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec {
|
||||||
multitrandata = callPackage ../tools/text/multitran/data { };
|
multitrandata = callPackage ../tools/text/multitran/data { };
|
||||||
|
|
||||||
@ -1216,6 +1183,8 @@ let
|
|||||||
inherit (gnome) gtk;
|
inherit (gnome) gtk;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
|
||||||
|
|
||||||
upx = callPackage ../tools/compression/upx { };
|
upx = callPackage ../tools/compression/upx { };
|
||||||
|
|
||||||
vbetool = builderDefsPackage ../tools/system/vbetool {
|
vbetool = builderDefsPackage ../tools/system/vbetool {
|
||||||
@ -1384,14 +1353,11 @@ let
|
|||||||
### SHELLS
|
### SHELLS
|
||||||
|
|
||||||
|
|
||||||
bash = lowPrio (useFromStdenv "bash" bashReal);
|
bash = lowPrio (callPackage ../shells/bash {
|
||||||
|
|
||||||
bashReal = callPackage ../shells/bash {
|
|
||||||
texinfo = null;
|
texinfo = null;
|
||||||
};
|
});
|
||||||
|
|
||||||
bashInteractive = appendToName "interactive" (bashReal.override {
|
bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
|
||||||
inherit readline texinfo;
|
|
||||||
interactive = true;
|
interactive = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -2088,8 +2054,7 @@ let
|
|||||||
fetchurl = fetchurlBoot;
|
fetchurl = fetchurlBoot;
|
||||||
};
|
};
|
||||||
|
|
||||||
perl = useFromStdenv "perl"
|
perl = if system != "i686-cygwin" then perl510 else sysPerl;
|
||||||
(if system != "i686-cygwin" then perl510 else sysPerl);
|
|
||||||
|
|
||||||
php = makeOverridable (import ../development/interpreters/php) {
|
php = makeOverridable (import ../development/interpreters/php) {
|
||||||
inherit
|
inherit
|
||||||
@ -2286,10 +2251,9 @@ let
|
|||||||
|
|
||||||
avrdude = callPackage ../development/tools/misc/avrdude { };
|
avrdude = callPackage ../development/tools/misc/avrdude { };
|
||||||
|
|
||||||
binutils = useFromStdenv "binutils"
|
binutils = callPackage ../development/tools/misc/binutils {
|
||||||
(import ../development/tools/misc/binutils {
|
inherit noSysDirs;
|
||||||
inherit fetchurl stdenv noSysDirs;
|
};
|
||||||
});
|
|
||||||
|
|
||||||
binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils {
|
binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils {
|
||||||
inherit stdenv fetchurl;
|
inherit stdenv fetchurl;
|
||||||
@ -2390,10 +2354,7 @@ let
|
|||||||
|
|
||||||
gnum4 = callPackage ../development/tools/misc/gnum4 { };
|
gnum4 = callPackage ../development/tools/misc/gnum4 { };
|
||||||
|
|
||||||
gnumake = useFromStdenv "gnumake"
|
gnumake = callPackage ../development/tools/build-managers/gnumake { };
|
||||||
(import ../development/tools/build-managers/gnumake {
|
|
||||||
inherit fetchurl stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { };
|
gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { };
|
||||||
|
|
||||||
@ -2459,31 +2420,19 @@ let
|
|||||||
*/
|
*/
|
||||||
};
|
};
|
||||||
|
|
||||||
patchelf = useFromStdenv "patchelf"
|
patchelf = callPackage ../development/tools/misc/patchelf { };
|
||||||
(import ../development/tools/misc/patchelf {
|
|
||||||
inherit fetchurl stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
patchelf06 = callPackage ../development/tools/misc/patchelf/0.6.nix { };
|
patchelf06 = callPackage ../development/tools/misc/patchelf/0.6.nix { };
|
||||||
|
|
||||||
pmccabe = callPackage ../development/tools/misc/pmccabe { };
|
pmccabe = callPackage ../development/tools/misc/pmccabe { };
|
||||||
|
|
||||||
/**
|
|
||||||
* pkgconfig is optionally taken from the stdenv to allow bootstrapping
|
|
||||||
* of glib and pkgconfig itself on MinGW.
|
|
||||||
*/
|
|
||||||
pkgconfigReal = useFromStdenv "pkgconfig"
|
|
||||||
(import ../development/tools/misc/pkgconfig {
|
|
||||||
inherit fetchurl stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
/* Make pkgconfig always return a buildDrv, never a proper hostDrv,
|
/* Make pkgconfig always return a buildDrv, never a proper hostDrv,
|
||||||
because most usage of pkgconfig as buildInput (inheritance of
|
because most usage of pkgconfig as buildInput (inheritance of
|
||||||
pre-cross nixpkgs) means using it using as buildNativeInput
|
pre-cross nixpkgs) means using it using as buildNativeInput
|
||||||
cross_renaming: we should make all programs use pkgconfig as
|
cross_renaming: we should make all programs use pkgconfig as
|
||||||
buildNativeInput after the renaming.
|
buildNativeInput after the renaming.
|
||||||
*/
|
*/
|
||||||
pkgconfig = forceBuildDrv pkgconfigReal;
|
pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { });
|
||||||
|
|
||||||
radare = callPackage ../development/tools/analysis/radare {
|
radare = callPackage ../development/tools/analysis/radare {
|
||||||
inherit (gtkLibs) gtk;
|
inherit (gtkLibs) gtk;
|
||||||
@ -2561,10 +2510,7 @@ let
|
|||||||
|
|
||||||
aalib = callPackage ../development/libraries/aalib { };
|
aalib = callPackage ../development/libraries/aalib { };
|
||||||
|
|
||||||
acl = useFromStdenv "acl"
|
acl = callPackage ../development/libraries/acl { };
|
||||||
(import ../development/libraries/acl {
|
|
||||||
inherit stdenv fetchurl gettext attr libtool;
|
|
||||||
});
|
|
||||||
|
|
||||||
adns = import ../development/libraries/adns/1.4.nix {
|
adns = import ../development/libraries/adns/1.4.nix {
|
||||||
inherit stdenv fetchurl;
|
inherit stdenv fetchurl;
|
||||||
@ -2601,10 +2547,7 @@ let
|
|||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
});
|
});
|
||||||
|
|
||||||
attr = useFromStdenv "attr"
|
attr = callPackage ../development/libraries/attr { };
|
||||||
(import ../development/libraries/attr {
|
|
||||||
inherit stdenv fetchurl gettext libtool;
|
|
||||||
});
|
|
||||||
|
|
||||||
aubio = callPackage ../development/libraries/aubio { };
|
aubio = callPackage ../development/libraries/aubio { };
|
||||||
|
|
||||||
@ -2839,7 +2782,7 @@ let
|
|||||||
|
|
||||||
glfw = callPackage ../development/libraries/glfw { };
|
glfw = callPackage ../development/libraries/glfw { };
|
||||||
|
|
||||||
glibc = useFromStdenv "glibc" glibc211;
|
glibc = glibc211;
|
||||||
|
|
||||||
glibc25 = callPackage ../development/libraries/glibc-2.5 {
|
glibc25 = callPackage ../development/libraries/glibc-2.5 {
|
||||||
kernelHeaders = linuxHeaders;
|
kernelHeaders = linuxHeaders;
|
||||||
@ -3155,7 +3098,11 @@ let
|
|||||||
inherit (gnome) libgnomecanvas;
|
inherit (gnome) libgnomecanvas;
|
||||||
};
|
};
|
||||||
|
|
||||||
lcms = callPackage ../development/libraries/lcms { };
|
lcms = lcms1;
|
||||||
|
|
||||||
|
lcms1 = callPackage ../development/libraries/lcms { };
|
||||||
|
|
||||||
|
lcms2 = callPackage ../development/libraries/lcms2 { };
|
||||||
|
|
||||||
lensfun = callPackage ../development/libraries/lensfun {
|
lensfun = callPackage ../development/libraries/lensfun {
|
||||||
inherit (gnome) glib;
|
inherit (gnome) glib;
|
||||||
@ -3388,6 +3335,8 @@ let
|
|||||||
|
|
||||||
libssh = callPackage ../development/libraries/libssh { };
|
libssh = callPackage ../development/libraries/libssh { };
|
||||||
|
|
||||||
|
libssh2 = callPackage ../development/libraries/libssh2 { };
|
||||||
|
|
||||||
libstartup_notification = callPackage ../development/libraries/startup-notification { };
|
libstartup_notification = callPackage ../development/libraries/startup-notification { };
|
||||||
|
|
||||||
libtasn1 = callPackage ../development/libraries/libtasn1 { };
|
libtasn1 = callPackage ../development/libraries/libtasn1 { };
|
||||||
@ -3604,6 +3553,11 @@ let
|
|||||||
cplusplusSupport = !stdenv ? isDietLibC;
|
cplusplusSupport = !stdenv ? isDietLibC;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc {
|
||||||
|
vlc = vlc.override { qt4 = qt47; };
|
||||||
|
inherit (kde45) automoc4;
|
||||||
|
};
|
||||||
|
|
||||||
physfs = callPackage ../development/libraries/physfs { };
|
physfs = callPackage ../development/libraries/physfs { };
|
||||||
|
|
||||||
plib = callPackage ../development/libraries/plib { };
|
plib = callPackage ../development/libraries/plib { };
|
||||||
@ -3739,9 +3693,14 @@ let
|
|||||||
ncurses = null;
|
ncurses = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
sqliteInteractive = lowPrio (appendToName "interactive" (sqlite.override {
|
sqlite36 = callPackage ../development/libraries/sqlite/3.6.x.nix {
|
||||||
|
readline = null;
|
||||||
|
ncurses = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
sqliteInteractive = appendToName "interactive" (sqlite.override {
|
||||||
inherit readline ncurses;
|
inherit readline ncurses;
|
||||||
}));
|
});
|
||||||
|
|
||||||
stlport = callPackage ../development/libraries/stlport { };
|
stlport = callPackage ../development/libraries/stlport { };
|
||||||
|
|
||||||
@ -4278,8 +4237,6 @@ let
|
|||||||
|
|
||||||
dmtcp = callPackage ../os-specific/linux/dmtcp { };
|
dmtcp = callPackage ../os-specific/linux/dmtcp { };
|
||||||
|
|
||||||
dmtcp_devel = callPackage ../os-specific/linux/dmtcp/devel.nix { };
|
|
||||||
|
|
||||||
dietlibc = callPackage ../os-specific/linux/dietlibc {
|
dietlibc = callPackage ../os-specific/linux/dietlibc {
|
||||||
# Dietlibc 0.30 doesn't compile on PPC with GCC 4.1, bus GCC 3.4 works.
|
# Dietlibc 0.30 doesn't compile on PPC with GCC 4.1, bus GCC 3.4 works.
|
||||||
stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv;
|
stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv;
|
||||||
@ -4743,6 +4700,10 @@ let
|
|||||||
|
|
||||||
# pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
|
# pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
|
||||||
|
|
||||||
|
pam_ccreds = callPackage ../os-specific/linux/pam_ccreds {
|
||||||
|
db = db4;
|
||||||
|
};
|
||||||
|
|
||||||
pam_console = callPackage ../os-specific/linux/pam_console {
|
pam_console = callPackage ../os-specific/linux/pam_console {
|
||||||
libtool = libtool_1_5;
|
libtool = libtool_1_5;
|
||||||
flex = if stdenv.system == "i686-linux" then flex else flex2533;
|
flex = if stdenv.system == "i686-linux" then flex else flex2533;
|
||||||
@ -4750,6 +4711,8 @@ let
|
|||||||
|
|
||||||
pam_devperm = callPackage ../os-specific/linux/pam_devperm { };
|
pam_devperm = callPackage ../os-specific/linux/pam_devperm { };
|
||||||
|
|
||||||
|
pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { };
|
||||||
|
|
||||||
pam_ldap = callPackage ../os-specific/linux/pam_ldap { };
|
pam_ldap = callPackage ../os-specific/linux/pam_ldap { };
|
||||||
|
|
||||||
pam_login = callPackage ../os-specific/linux/pam_login { };
|
pam_login = callPackage ../os-specific/linux/pam_login { };
|
||||||
@ -5073,8 +5036,8 @@ let
|
|||||||
inherit (gnome) libglade libgnomecanvas;
|
inherit (gnome) libglade libgnomecanvas;
|
||||||
};
|
};
|
||||||
|
|
||||||
adobeReader = callPackage ../applications/misc/adobe-reader {
|
adobeReader = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg) ../applications/misc/adobe-reader {
|
||||||
inherit (gtkLibs) glib pango atk gtk;
|
inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk;
|
||||||
};
|
};
|
||||||
|
|
||||||
amsn = callPackage ../applications/networking/instant-messengers/amsn {
|
amsn = callPackage ../applications/networking/instant-messengers/amsn {
|
||||||
@ -6003,7 +5966,7 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
rsync = callPackage ../applications/networking/sync/rsync {
|
rsync = callPackage ../applications/networking/sync/rsync {
|
||||||
enableACLs = !stdenv.isDarwin;
|
enableACLs = !(stdenv.isDarwin || stdenv.isSunOS);
|
||||||
};
|
};
|
||||||
|
|
||||||
rxvt = callPackage ../applications/misc/rxvt { };
|
rxvt = callPackage ../applications/misc/rxvt { };
|
||||||
@ -6173,9 +6136,9 @@ let
|
|||||||
vimHugeX = vim_configurable;
|
vimHugeX = vim_configurable;
|
||||||
|
|
||||||
vim_configurable = import ../applications/editors/vim/configurable.nix {
|
vim_configurable = import ../applications/editors/vim/configurable.nix {
|
||||||
inherit fetchurl stdenv ncurses pkgconfig composableDerivation lib;
|
inherit fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib;
|
||||||
inherit (xlibs) libX11 libXext libSM libXpm
|
inherit (xlibs) libX11 libXext libSM libXpm
|
||||||
libXt libXaw libXau libXmu;
|
libXt libXaw libXau libXmu libICE;
|
||||||
inherit (gtkLibs) glib gtk;
|
inherit (gtkLibs) glib gtk;
|
||||||
features = "huge"; # one of tiny, small, normal, big or huge
|
features = "huge"; # one of tiny, small, normal, big or huge
|
||||||
# optional features by passing
|
# optional features by passing
|
||||||
@ -6183,6 +6146,8 @@ let
|
|||||||
# TODO mzschemeinterp perlinterp
|
# TODO mzschemeinterp perlinterp
|
||||||
inherit python perl tcl ruby /*x11*/;
|
inherit python perl tcl ruby /*x11*/;
|
||||||
|
|
||||||
|
lua = lua5;
|
||||||
|
|
||||||
# optional features by flags
|
# optional features by flags
|
||||||
flags = [ "X11" ]; # only flag "X11" by now
|
flags = [ "X11" ]; # only flag "X11" by now
|
||||||
};
|
};
|
||||||
@ -6205,6 +6170,8 @@ let
|
|||||||
graphicsSupport = false;
|
graphicsSupport = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
weechat = callPackage ../applications/networking/irc/weechat { };
|
||||||
|
|
||||||
wings = callPackage ../applications/graphics/wings { };
|
wings = callPackage ../applications/graphics/wings { };
|
||||||
|
|
||||||
# I'm keen on wmiimenu only >wmii-3.5 no longer has it...
|
# I'm keen on wmiimenu only >wmii-3.5 no longer has it...
|
||||||
@ -6601,22 +6568,26 @@ let
|
|||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
});
|
});
|
||||||
|
|
||||||
kde45 = makeOverridable (import ../desktops/kde-4.5) (pkgs // {
|
kde45 = callPackage ../desktops/kde-4.5 {
|
||||||
|
callPackage = newScope ({
|
||||||
qt4 = qt47;
|
qt4 = qt47;
|
||||||
pyqt4 = pyqt4.override { qt4 = qt47; };
|
pyqt4 = pyqt4.override { qt4 = qt47; };
|
||||||
libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
|
libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
|
||||||
shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
|
shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
|
||||||
});
|
} // kde45);
|
||||||
|
};
|
||||||
|
|
||||||
xfce = xfce4;
|
xfce = xfce4;
|
||||||
xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);
|
xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);
|
||||||
|
|
||||||
|
|
||||||
### SCIENCE
|
### SCIENCE
|
||||||
|
|
||||||
xplanet = callPackage ../applications/science/xplanet {
|
xplanet = callPackage ../applications/science/xplanet {
|
||||||
inherit (gtkLibs) pango;
|
inherit (gtkLibs) pango;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
### SCIENCE/GEOMETRY
|
### SCIENCE/GEOMETRY
|
||||||
|
|
||||||
drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
|
drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
|
||||||
@ -6686,9 +6657,7 @@ let
|
|||||||
|
|
||||||
hol_light = callPackage ../applications/science/logic/hol_light { };
|
hol_light = callPackage ../applications/science/logic/hol_light { };
|
||||||
|
|
||||||
hol_light_binaries = callPackage ../applications/science/logic/hol_light/binaries.nix {
|
hol_light_binaries = callPackage ../applications/science/logic/hol_light/binaries.nix { };
|
||||||
dmtcp = dmtcp_devel;
|
|
||||||
};
|
|
||||||
|
|
||||||
# This is a special version of OCaml handcrafted especially for
|
# This is a special version of OCaml handcrafted especially for
|
||||||
# hol_light it should be merged with the current expresion for ocaml
|
# hol_light it should be merged with the current expresion for ocaml
|
||||||
@ -6883,6 +6852,7 @@ let
|
|||||||
psi = callPackage ../applications/networking/instant-messengers/psi {
|
psi = callPackage ../applications/networking/instant-messengers/psi {
|
||||||
qca2 = kde45.qca2;
|
qca2 = kde45.qca2;
|
||||||
qca2_ossl = kde45.qca2_ossl;
|
qca2_ossl = kde45.qca2_ossl;
|
||||||
|
qt4 = qt47;
|
||||||
};
|
};
|
||||||
|
|
||||||
putty = callPackage ../applications/networking/remote/putty {
|
putty = callPackage ../applications/networking/remote/putty {
|
||||||
@ -6914,9 +6884,7 @@ let
|
|||||||
|
|
||||||
tex4ht = callPackage ../misc/tex/tex4ht { };
|
tex4ht = callPackage ../misc/tex/tex4ht { };
|
||||||
|
|
||||||
texFunctions = callPackage ../misc/tex/nix {
|
texFunctions = import ../misc/tex/nix pkgs;
|
||||||
inherit (haskellPackages) lhs2tex;
|
|
||||||
};
|
|
||||||
|
|
||||||
texLive = builderDefsPackage (import ../misc/tex/texlive) {
|
texLive = builderDefsPackage (import ../misc/tex/texlive) {
|
||||||
inherit builderDefs zlib bzip2 ncurses libpng ed
|
inherit builderDefs zlib bzip2 ncurses libpng ed
|
||||||
|
|||||||
@ -904,7 +904,7 @@ rec {
|
|||||||
|
|
||||||
DBDSQLite = import ../development/perl-modules/DBD-SQLite {
|
DBDSQLite = import ../development/perl-modules/DBD-SQLite {
|
||||||
inherit fetchurl buildPerlPackage DBI;
|
inherit fetchurl buildPerlPackage DBI;
|
||||||
inherit (pkgs) sqlite;
|
sqlite = pkgs.sqlite36;
|
||||||
};
|
};
|
||||||
|
|
||||||
DBDmysql = import ../development/perl-modules/DBD-mysql {
|
DBDmysql = import ../development/perl-modules/DBD-mysql {
|
||||||
|
|||||||
@ -106,6 +106,8 @@ rec {
|
|||||||
processPackage = attrSet:
|
processPackage = attrSet:
|
||||||
if attrSet ? recurseForDerivations && attrSet.recurseForDerivations then
|
if attrSet ? recurseForDerivations && attrSet.recurseForDerivations then
|
||||||
packagesWithMetaPlatform attrSet
|
packagesWithMetaPlatform attrSet
|
||||||
|
else if attrSet ? recurseForRelease && attrSet.recurseForRelease then
|
||||||
|
packagesWithMetaPlatform attrSet
|
||||||
else
|
else
|
||||||
if attrSet ? meta && attrSet.meta ? platforms
|
if attrSet ? meta && attrSet.meta ? platforms
|
||||||
then attrSet.meta.platforms
|
then attrSet.meta.platforms
|
||||||
|
|||||||
@ -329,6 +329,7 @@ with (import ./release-lib.nix);
|
|||||||
vsftpd = linux;
|
vsftpd = linux;
|
||||||
w3m = all;
|
w3m = all;
|
||||||
webkit = linux;
|
webkit = linux;
|
||||||
|
weechat = linux;
|
||||||
wget = all;
|
wget = all;
|
||||||
which = all;
|
which = all;
|
||||||
wicd = linux;
|
wicd = linux;
|
||||||
@ -447,27 +448,6 @@ with (import ./release-lib.nix);
|
|||||||
};
|
};
|
||||||
|
|
||||||
kde44 = {
|
kde44 = {
|
||||||
kdelibs = linux;
|
|
||||||
kdebase_workspace = linux;
|
|
||||||
kdebase = linux;
|
|
||||||
kdebase_runtime = linux;
|
|
||||||
oxygen_icons = linux;
|
|
||||||
kdepimlibs = linux;
|
|
||||||
kdeadmin = linux;
|
|
||||||
kdeartwork = linux;
|
|
||||||
kdeaccessibility = linux;
|
|
||||||
kdeedu = linux;
|
|
||||||
kdegraphics = linux;
|
|
||||||
kdemultimedia = linux;
|
|
||||||
kdenetwork = linux;
|
|
||||||
kdepim = linux;
|
|
||||||
kdepim_runtime = linux;
|
|
||||||
kdeplasma_addons = linux;
|
|
||||||
kdegames = linux;
|
|
||||||
kdetoys = linux;
|
|
||||||
kdeutils = linux;
|
|
||||||
kdesdk = linux;
|
|
||||||
kdewebdev = linux;
|
|
||||||
krusader = linux;
|
krusader = linux;
|
||||||
kmplayer = linux;
|
kmplayer = linux;
|
||||||
ktorrent = linux;
|
ktorrent = linux;
|
||||||
@ -559,22 +539,27 @@ with (import ./release-lib.nix);
|
|||||||
lndir = all;
|
lndir = all;
|
||||||
setxkbmap = linux;
|
setxkbmap = linux;
|
||||||
xauth = linux;
|
xauth = linux;
|
||||||
|
xbitmaps = linux;
|
||||||
xev = linux;
|
xev = linux;
|
||||||
|
xf86inputevdev = linux;
|
||||||
xf86inputkeyboard = linux;
|
xf86inputkeyboard = linux;
|
||||||
xf86inputmouse = linux;
|
xf86inputmouse = linux;
|
||||||
xf86inputevdev = linux;
|
|
||||||
xf86inputsynaptics = linux;
|
xf86inputsynaptics = linux;
|
||||||
xf86videoati = linux;
|
xf86videoati = linux;
|
||||||
|
xf86videocirrus = linux;
|
||||||
xf86videointel = linux;
|
xf86videointel = linux;
|
||||||
xf86videonv = linux;
|
xf86videonv = linux;
|
||||||
xf86videovesa = linux;
|
xf86videovesa = linux;
|
||||||
xfs = linux;
|
xfs = linux;
|
||||||
xkbcomp = linux;
|
xkbcomp = linux;
|
||||||
|
xlsclients = linux;
|
||||||
xmessage = linux;
|
xmessage = linux;
|
||||||
xorgserver = linux;
|
xorgserver = linux;
|
||||||
|
xprop = linux;
|
||||||
xrandr = linux;
|
xrandr = linux;
|
||||||
xrdb = linux;
|
xrdb = linux;
|
||||||
xset = linux;
|
xset = linux;
|
||||||
|
xsetroot = linux;
|
||||||
};
|
};
|
||||||
|
|
||||||
} ))
|
} ))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user