Merge pull request #9869 from Mathnerd314/import-fix

all-packages: Use callPackage where possible
This commit is contained in:
Domen Kožar 2015-09-15 06:53:50 +02:00
commit eb29d8e44b
64 changed files with 409 additions and 726 deletions

View File

@ -1,6 +1,9 @@
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
# but I have gvim with python support now :) - Marc
args@{pkgs, source ? "default", ...}: with args;
args@{pkgs, source ? "default", fetchurl, fetchhg, stdenv, ncurses, pkgconfig, gettext
, composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
, libICE, ... }: with args;
let inherit (args.composableDerivation) composableDerivation edf;

View File

@ -1,4 +1,7 @@
args@{...}: with args;
args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext
, composableDerivation, lib, config, python, perl, tcl, ruby, qt4
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
, libICE, ... }: with args;
let tag = "20140827";
sha256 = "02adf2212872db3c5d133642d2c12fbfc28b506e4c0c42552e3d079756f63f65";

View File

@ -1,4 +1,4 @@
a :
a @ { libXt, libX11, libXext, xextproto, xproto, gsl, aalib, zlib, intltool, gettext, perl, ... }:
let
fetchurl = a.fetchurl;

View File

@ -1,4 +1,4 @@
a :
a @ { libgphoto2, fuse, pkgconfig, glib, libtool, ... } :
let
fetchurl = a.fetchurl;
s = import ./src-info-for-gphotofs.nix;

View File

@ -1,4 +1,11 @@
{ config, ... }@a:
{ config, libXmu, libXext, libXp, libX11, libXt, libSM, libICE, libXpm
, libXaw, libXrender
, composableDerivation, stdenv, fetchurl
, lib, flex, bison, cairo, fontconfig
, gdal, zlib, ncurses, gdbm, proj, pkgconfig, swig
, blas, liblapack, libjpeg, libpng, mysql, unixODBC, mesa, postgresql, python
, readline, sqlite, tcl, tk, libtiff, freetype, makeWrapper, wxGTK, ffmpeg, fftw
, wxPython, motif, opendwg }@a:
# You can set gui by exporting GRASS_GUI=..
# see http://grass.itc.it/gdp/html_grass64/g.gui.html
@ -28,7 +35,7 @@ a.composableDerivation.composableDerivation {} (fix: {
name = "grass-6.4.0RC6";
buildInputs = [
# gentoos package depends on gmath ?
# gentoos package depends on gmath ?
a.pkgconfig
a.flex a.bison a.libXmu a.libXext a.libXp a.libX11 a.libXt a.libSM a.libICE
a.libXpm a.libXaw a.flex a.bison a.gdbm
@ -72,7 +79,7 @@ a.composableDerivation.composableDerivation {} (fix: {
configureFlags = [ "--with-python=${a.python}/bin/python-config" ];
buildInputs = [a.python a.swig];
};
}
// edf { name = "_64bit"; feat = "64bit"; }
// wwfp a.ncurses { name = "curses"; }
@ -119,7 +126,7 @@ a.composableDerivation.composableDerivation {} (fix: {
// wwfp a.unixODBC { name = "odbc"; }
// wwfp a.fftw { name = "fftw"; }
// wwf {
name = "blas";
name = "blas";
enable.configureFlags = [ "--with-blas-libs=${a.blas}/lib" ];
}
// wwf {

View File

@ -1,11 +1,15 @@
args : with args;
args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss
, gtkspell, aspell, gettext, ncurses, avahi, dbus, dbus_glib, python
, libtool, automake, autoconf, gstreamer
, gtk, glib
, libXScrnSaver, scrnsaverproto, libX11, xproto, kbproto, ... }: with args;
/*
arguments: all buildInputs
optional: purple2Source: purple-2 source - place to copy libpurple from
optional: purple2Source: purple-2 source - place to copy libpurple from
(to use a fresher pidgin build)
*/
let
externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null;
let
externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null;
in
rec {
src = fetchurl {
@ -16,9 +20,9 @@ rec {
buildInputs = [gtkspell aspell
gstreamer startupnotification
libxml2 openssl nss
libXScrnSaver ncurses scrnsaverproto
libXScrnSaver ncurses scrnsaverproto
libX11 xproto kbproto GConf avahi
dbus dbus_glib glib python
dbus dbus_glib glib python
autoconf libtool automake];
propagatedBuildInputs = [
@ -38,11 +42,11 @@ rec {
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]
++ (lib.optional externalPurple2 "postInstall")
;
name = "carrier-2.5.0";
meta = {
description = "PidginIM GUI fork with user-friendly development model";
homepage = http://funpidgin.sf.net;
homepage = http://funpidgin.sf.net;
};
} // (if externalPurple2 then {
postInstall = fullDepEntry (''

View File

@ -1,4 +1,4 @@
args : with args;
args @ { libxml2, perl, intltool, libtool, pkgconfig, gtk, ... } : with args;
let version = lib.attrByPath ["version"] "1.1.0" args; in
rec {
src = fetchurl {
@ -17,7 +17,7 @@ rec {
doPreBuild = fullDepEntry (''
cp drgeo.desktop.in drgeo.desktop
'') ["minInit" "doUnpack"];
name = "drgeo-" + version;
meta = {
description = "Interactive geometry program";

View File

@ -1,10 +1,10 @@
a :
let
a @ { mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, libXcursor, ... } :
let
fetchurl = a.fetchurl;
version = "1.5";
version = "1.5";
buildInputs = with a; [
mesa lesstif libX11 libXaw xproto libXt libSM libICE
mesa lesstif libX11 libXaw xproto libXt libSM libICE
libXmu libXext libXcursor
];
in
@ -28,9 +28,9 @@ rec {
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = ["unpackTarballs"
phaseNames = ["unpackTarballs"
"setPlatform" "extraVars"
"buildVibrant" "buildContent"
"buildVibrant" "buildContent"
"install"];
unpackTarballs = a.fullDepEntry (''
@ -42,10 +42,10 @@ rec {
sed -e s/SGI=/SGI=no/ -i content/makefile_v
'') ["minInit"];
platformTLAContent = if a.stdenv.isLinux then "LIN" else
platformTLAContent = if a.stdenv.isLinux then "LIN" else
throw "Three-letter code for the platform is not known";
platformTLAVibrant = if a.stdenv.isLinux then "lnx" else
platformTLAVibrant = if a.stdenv.isLinux then "lnx" else
throw "Three-letter code for the platform is not known";
setPlatform = a.fullDepEntry (''

View File

@ -1,7 +1,7 @@
/* moving all git tools into one attribute set because git is unlikely to be
* referenced by other packages and you can get a fast overview.
*/
args: with args; with pkgs;
args @ {pkgs}: with args; with pkgs;
let
inherit (pkgs) stdenv fetchgit fetchurl subversion;

View File

@ -1,4 +1,4 @@
args : with args;
args @ { graphviz, pkgconfig, autoconf, automake, libtool, glib, gtk, ... }: with args;
rec {
srcDrv = fetchmtn {
name = "monotone-viz-mtn-checkout";
@ -9,7 +9,7 @@ rec {
};
src = srcDrv + "/";
buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
pkgconfig autoconf automake libtool];
configureFlags = ["--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"];

View File

@ -1,4 +1,4 @@
args : with args;
args @ { makeWrapper, python, ... }: with args;
let version = if args ? version then args.version else "0.9.35"; in
rec {
src = fetchurl {
@ -14,10 +14,10 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
name = "tailor-" + version;
meta = {
description = "Version control tools integration tool";
};
}

View File

@ -1,5 +1,4 @@
args : with args;
args @ { monotone, cheetahTemplate, highlight, ctags, makeWrapper, graphviz, which, python, ... }: with args;
rec {
src = fetchurl {
url = http://viewmtn.1erlei.de/downloads/viewmtn-0.10.tgz;

View File

@ -1,26 +1,26 @@
args: with args; with stringsWithDeps; with lib;
args @ {stringsWithDeps, lib, stdenv, writeScript, fetchurl, fetchmtn, fetchgit, ...}: with args; with stringsWithDeps; with lib;
let inherit (builtins) head tail trace; in
(rec
{
inherit writeScript;
inherit writeScript;
src = attrByPath ["src"] "" args;
addSbinPath = attrByPath ["addSbinPath"] false args;
forceShare = if args ? forceShare then args.forceShare else ["man" "doc" "info"];
forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL"
"README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++
(optional (attrByPath ["forceCopyDoc"] true args) "doc");
forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL"
"README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++
(optional (attrByPath ["forceCopyDoc"] true args) "doc");
hasSuffixHack = a: b: hasSuffix (a+(substring 0 0 b)) ((substring 0 0 a)+b);
archiveType = s:
archiveType = s:
(if hasSuffixHack ".tar" s then "tar"
else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz"
else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) ||
else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz"
else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) ||
(hasSuffixHack ".tbz" s) then "tbz2"
else if hasSuffixHack ".tar.Z" s then "tZ"
else if hasSuffixHack ".tar.Z" s then "tZ"
else if hasSuffixHack ".tar.lzma" s then "tar.lzma"
else if hasSuffixHack ".tar.xz" s then "tar.xz"
else if hasSuffixHack ".rar" s then "rar"

View File

@ -1,6 +1,6 @@
# trivial builder for Emacs packages
{ lib, ... }@envargs:
{ lib, stdenv, texinfo, ... }@envargs:
with lib;

View File

@ -1,4 +1,5 @@
args : with args;
args @ { fetchurl, stdenv, builderDefs, paths, mkfontdir, mkfontscale }:
with args;
let localDefs = builderDefs.passthru.function {
src =""; /* put a fetchurl here */
buildInputs = [mkfontdir mkfontscale];

View File

@ -1,4 +1,4 @@
args: with args; rec {
args @ { fetchurl, fontforge, lib, ... }: with args; rec {
name = "linux-libertine-5.3.0";
src = fetchurl {

View File

@ -1,11 +1,13 @@
a :
let
a @ { mpfr, m4, binutils, fetchcvs, emacs, zlib, which
, texinfo, libX11, xproto, inputproto, libXi
, libXext, xextproto, libXt, libXaw, libXmu, stdenv, ... } :
let
buildInputs = with a; [
mpfr m4 binutils emacs gmp
libX11 xproto inputproto libXi
libX11 xproto inputproto libXi
libXext xextproto libXt libXaw libXmu
zlib which texinfo texLive
];
];
in
(
@ -40,7 +42,7 @@ rec {
'') ["minInit" "doUnpack" "addInputs"];
/* doConfigure should be removed if not needed */
phaseNames = ["setVars" "doUnpack" "preBuild"
phaseNames = ["setVars" "doUnpack" "preBuild"
"doConfigure" "doMakeInstall"];
}) // {
meta = {
@ -48,7 +50,7 @@ rec {
maintainers = [
a.lib.maintainers.raskin
];
platforms = with a.lib.platforms;
platforms = with a.lib.platforms;
linux;
};
}

View File

@ -1,4 +1,4 @@
args : with args;
args @ { makeWrapper, ruby, ... }: with args;
rec {
name = "rubygems-" + version;
@ -23,7 +23,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doPatch" "doInstall"];
meta = {
description = "Ruby gems package collection";
longDescription = ''

View File

@ -3,9 +3,9 @@ x@{builderDefsPackage
, inputproto, libXi, fetchsvn, pkgconfig
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
(a :
let
helperArgNames = ["stdenv" "fetchsvn" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)

View File

@ -1,11 +1,11 @@
a :
let
a @ { tcsh, mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, ... }:
let
fetchurl = a.fetchurl;
version = "20090809";
version = "20090809";
buildInputs = with a; [
tcsh libX11 libXaw lesstif xproto mesa libXt
libSM libICE libXmu libXext
tcsh libX11 libXaw lesstif xproto mesa libXt
libSM libICE libXmu libXext
];
in
rec {

View File

@ -1,4 +1,4 @@
args : with args;
{fetchurl, stdenv, unixODBC, glibc, libtool, openssl, zlib, postgresql, mysql, sqlite}:
# each attr contains the name deriv referencing the derivation and ini which
# evaluates to a string which can be appended to the global unix odbc ini file
# to register the driver
@ -9,7 +9,7 @@ args : with args;
deriv = stdenv.mkDerivation {
name = "unix-odbc-pg-odbcng-0.90.101";
buildInputs = [ unixODBC glibc libtool postgresql ];
# added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose'
# added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose'
preConfigure="
export CPPFLAGS=-I${unixODBC}/include
export LDFLAGS='-L${unixODBC}/lib -lltdl'
@ -37,7 +37,7 @@ args : with args;
export CPPFLAGS=-I${unixODBC}/include
export LDFLAGS='-L${unixODBC}/lib -lltdl'
";
# added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose'
# added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose'
src = fetchurl {
url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
sha256 = "0mh10chkmlppidnmvgbp47v5jnphsrls28zwbvyk2crcn8gdx9q1";
@ -48,7 +48,7 @@ args : with args;
license = "LGPL";
};
};
ini =
ini =
"[PostgreSQL]\n" +
"Description = official PostgreSQL driver for Linux & Win32\n" +
"Driver = ${deriv}/lib/psqlodbcw.so\n" +
@ -97,7 +97,7 @@ args : with args;
mv "$out"/*.la "$out/lib"
'';
meta = {
meta = {
description = "ODBC driver for SQLite";
homepage = http://www.ch-werner.de/sqliteodbc;
license = stdenv.lib.licenses.bsd2;

View File

@ -1,8 +1,8 @@
a :
let
a @ {python, ...} :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "0.4.8" a;
version = a.lib.attrByPath ["version"] "0.4.8" a;
buildInputs = with a; [
python
];
@ -24,7 +24,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["doPatch" "installPythonPackage"];
name = "python-irclib-" + version;
meta = {
description = "Python IRC library";

View File

@ -1,8 +1,8 @@
a :
let
a @ { python, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, ... } :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "0.1.9" a;
version = a.lib.attrByPath ["version"] "0.1.9" a;
buildInputs = with a; [
pkgconfig pygtk
];

View File

@ -1,8 +1,8 @@
a :
let
a @ {python, setuptools, ... } :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "0.5.0rc1" a;
version = a.lib.attrByPath ["version"] "0.5.0rc1" a;
buildInputs = with a; [
python setuptools
];
@ -22,7 +22,7 @@ rec {
mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
'') ["defEnsureDir" "addInputs"];
name = "xmpp.py-" + version;
meta = {
description = "XMPP python library";

View File

@ -1,5 +1,5 @@
a :
let
a @ { mesa, SDL, SDL_image, SDL_mixer, ... } :
let
s = import ./src-for-default.nix;
buildInputs = with a; [
mesa SDL SDL_mixer SDL_image
@ -21,7 +21,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["preBuild" "doMakeInstall"];
meta = {
description = "A physics-based game";
maintainers = [ a.lib.maintainers.raskin ];

View File

@ -1,7 +1,7 @@
args : with args;
let
version = lib.attrByPath ["version"] "1.12.1" args;
sha256 = lib.attrByPath ["sha256"]
args @ { libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib, ... }: with args;
let
version = lib.attrByPath ["version"] "1.12.1" args;
sha256 = lib.attrByPath ["sha256"]
"0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj" args;
pkgName = "lincity";
in
@ -17,7 +17,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doMakeInstall"];
name = "${pkgName}-" + version;
meta = {
description = "City simulation game";

View File

@ -1,11 +1,16 @@
a :
let
a @ { xproto, libX11, libXrender
, gmp, mesa, libjpeg, libpng
, expat, gettext, perl
, SDL, SDL_image, SDL_mixer, SDL_ttf
, curl, sqlite
, libogg, libvorbis, libcaca, csound, cunit, ... } :
let
buildInputs = with a; [
xproto libX11 gmp guile
mesa libjpeg libpng
expat gettext perl
SDL SDL_image SDL_mixer SDL_ttf
curl sqlite
curl sqlite
libogg libvorbis csound
libXrender libcaca cunit
];
@ -27,13 +32,13 @@ rec {
setVars = a.noDepEntry (''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/include/SDL"
'');
meta = {
description = "Quick tactics game";
maintainers = [
a.lib.maintainers.raskin
];
platforms = with a.lib.platforms;
platforms = with a.lib.platforms;
linux;
homepage = "http://www.gnu.org/software/liquidwar6/";
version = "0.6.3902";

View File

@ -1,4 +1,4 @@
a :
a @ {libX11, xproto, libXpm, libXt, ...} :
let
fetchurl = a.fetchurl;

View File

@ -1,4 +1,4 @@
a :
a @ { ncurses, flex, bison, autoconf, automake, m4, coreutils, ... } :
let
fetchurl = a.fetchurl;

View File

@ -6,7 +6,7 @@
# };
# Make additional configurations on demand:
# wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
{ lib, pkgs, system, callPackage,
{ lib, pkgs, system, callPackage, wineUnstable,
wineRelease ? "stable",
wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
@ -14,7 +14,7 @@
if wineRelease == "staging" then
callPackage ./staging.nix {
inherit libtxc_dxtn_Name;
wine = lib.getAttr wineBuild (callPackage ./packages.nix { wineRelease = "unstable"; });
wine = wineUnstable;
}
else
lib.getAttr wineBuild (callPackage ./packages.nix {

View File

@ -1,5 +1,5 @@
a :
let
a @ { libjpeg, pkgconfig, zlib, directfb, xproto, ... } :
let
s = import ./src-for-default.nix;
buildInputs = with a; [
directfb zlib libjpeg pkgconfig xproto
@ -14,13 +14,13 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "DirectFB VNC client";
maintainers = [
a.lib.maintainers.raskin
];
platforms = with a.lib.platforms;
platforms = with a.lib.platforms;
linux;
};
}

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ... } @ args:
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "3.10.87";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ... } @ args:
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "3.12.47";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ... } @ args:
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "3.14.51";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ... } @ args:
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "3.18.21";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ... } @ args:
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.1.6";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ... } @ args:
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.2";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ... } @ args:
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
let

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ... } @ args:
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.2-rc5";

View File

@ -1,4 +1,6 @@
args: with args;
args @ { fetchurl, stdenv, perl, lib, composableDerivation
, openldap, pam, db, cyrus_sasl, kerberos, libcap, expat, libxml2, libtool
, openssl, ... }: with args;
let edf = composableDerivation.edf; in
rec {
squid30 = composableDerivation.composableDerivation {} {

View File

@ -1,5 +1,8 @@
# THIS IS A GENERATED FILE. DO NOT EDIT!
args: with args;
args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol
, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;
let

View File

@ -229,7 +229,10 @@ open OUT, ">default.nix";
print OUT "";
print OUT <<EOF;
# THIS IS A GENERATED FILE. DO NOT EDIT!
args: with args;
args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol
, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;
let

View File

@ -1,8 +1,8 @@
a :
let
a @ { xmpppy, pythonIRClib, python, makeWrapper, ... } :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "0.4" a;
version = a.lib.attrByPath ["version"] "0.4" a;
buildInputs = with a; [
xmpppy pythonIRClib python makeWrapper
];
@ -30,7 +30,7 @@ rec {
echo "./irc.py \"$@\"" >> $out/bin/pyIRCt
chmod a+rx $out/bin/pyIRCt $out/share/${name}/irc.py
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
name = "pyIRCt-" + version;
meta = {
description = "IRC transport module for XMPP";

View File

@ -1,5 +1,5 @@
a :
let
a @ { xmpppy, python, makeWrapper, fetchcvs, ... } :
let
fetchurl = a.fetchurl;
buildInputs = with a; [
@ -32,7 +32,7 @@ rec {
echo "./mail.py \"$@\"" >> $out/bin/pyMAILt
chmod a+rx $out/bin/pyMAILt $out/share/${name}/mail.py
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
name = "pyMAILt-20090101";
meta = {
description = "Email transport module for XMPP";

View File

@ -1,5 +1,5 @@
a :
let
a @ { zlib, libpng, freetype, gd, which, libxml2, geoip, ... } :
let
s = import ./src-for-default.nix;
buildInputs = with a; [
zlib libpng freetype gd which libxml2
@ -15,7 +15,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall" "doLinks"];
doLinks = a.fullDepEntry (''
ln -s shared_en.xsl $out/share/webdruid/classic/shared.xsl
'') ["minInit"];

View File

@ -1,5 +1,5 @@
a :
let
a @ { cmake, patchelf, imagemagick, ... } :
let
fetchurl = a.fetchurl;
version = "1.1.0";
@ -27,7 +27,7 @@ rec {
export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
needLib64 = a.stdenv.system == "x86_64-linux";
postInstall = a.fullDepEntry(''

View File

@ -1,8 +1,8 @@
a :
let
a @ { intltool, perl, gettext, libusb, pkgconfig, bluez, readline, pcsclite, libical, gtk, glib, libXpm, ... } :
let
fetchurl = a.fetchurl;
s = import ./src-for-default.nix;
s = import ./src-for-default.nix;
buildInputs = with a; [
perl intltool gettext libusb
glib gtk pkgconfig bluez readline

View File

@ -1,5 +1,5 @@
a :
let
a @ { openssl, gmp, nettools, iproute, zlib, ... } :
let
s = import ./src-for-default.nix;
buildInputs = with a; [
openssl gmp zlib
@ -22,7 +22,7 @@ rec {
sed -e 's@"/sbin/ifconfig.*"@"${a.iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
sed -e 's@/sbin/ifconfig@${a.nettools}/sbin/ifconfig@g' -i src/device-*.C
'') ["minInit" "doUnpack"];
meta = {
description = "A proteted multinode virtual network";
maintainers = [

View File

@ -1,10 +1,10 @@
a :
let
a @ {ppp, ...} :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "3.11" a;
buildInputs = with a; [
ppp
ppp
];
in
rec {

View File

@ -1,5 +1,5 @@
args :
let
args @ {unzip, ... } :
let
lib = args.lib;
fetchurl = args.fetchurl;
fullDepEntry = args.fullDepEntry;

View File

@ -1,4 +1,4 @@
args : with args;
args @ { makeWrapper, ... }: with args;
rec {
src = fetchurl {
url = http://www.packetstormsecurity.nl/UNIX/utilities/framework-3.1.tar.gz;
@ -21,7 +21,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")];
name = "metasploit-framework-3.1";
meta = {
description = "Metasploit Framework - a collection of exploits";

View File

@ -1,8 +1,8 @@
a :
let
a @ { groff, ... } :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "2.17" a;
version = a.lib.attrByPath ["version"] "2.17" a;
buildInputs = with a; [
groff
];
@ -26,7 +26,7 @@ rec {
'') ["minInit" "doUnpack" "doConfigure"];
neededDirs = ["$out/bin" "$out/share/man/man8"];
name = "setserial-" + version;
meta = {
description = "Serial port configuration utility";

View File

@ -1,5 +1,5 @@
a :
let
a @ {pciutils, libx86, zlib, ...} :
let
s = import ./src-for-default.nix;
buildInputs = with a; [
libx86 pciutils zlib
@ -19,13 +19,13 @@ rec {
sed -e 's@$(libdir)/libpci.a@${a.pciutils}/lib/libpci.so@' -i Makefile.in
export NIX_LDFLAGS="$NIX_LDFLAGS -lpci"
'') ["doUnpack" "minInit"];
meta = {
description = "Video BIOS execution tool";
maintainers = [
a.lib.maintainers.raskin
];
platforms = with a.lib.platforms;
platforms = with a.lib.platforms;
linux;
};
}

View File

@ -1,4 +1,4 @@
args : with args;
args @ {poppler, perl, makeWrapper, ... }: with args;
rec {
name = "TeXLive-linkdir";

View File

@ -1,4 +1,4 @@
args: with args;
args @ {texLiveLatexXColor, texLivePGF, texLive, ...}: with args;
rec {
name = "texlive-beamer-2013";
src = fetchurl {

View File

@ -1,4 +1,4 @@
args: with args;
args @ {texLive, ...}: with args;
rec {
name = "texlive-cm-super-2009";
src = fetchurl {
@ -29,7 +29,7 @@ rec {
description = "Extra components for TeXLive: CM-Super fonts";
maintainers = [ args.lib.maintainers.raskin ];
# Actually, arch-independent..
# Actually, arch-independent..
hydraPlatforms = [];
};
}

View File

@ -1,4 +1,4 @@
args: with args;
args @ { texLive, ... }: with args;
rec {
name = "context-2014.05.21";
src = fetchurl {
@ -22,4 +22,4 @@ rec {
};
}

View File

@ -1,4 +1,11 @@
args : with args;
args @ {
builderDefs, zlib, bzip2, ncurses, libpng, ed, lesstif, ruby, potrace
, gd, t1lib, freetype, icu, perl, expat, curl, xz, pkgconfig, zziplib, texinfo
, libjpeg, bison, python, fontconfig, flex, poppler, libpaper, graphite2
, makeWrapper, gmp, mpfr, xpdf, config
, libXaw, libX11, xproto, libXt, libXpm
, libXmu, libXext, xextproto, libSM, libICE
, ... }: with args;
rec {
src = assert config.allowTexliveBuilds or true; fetchurl {

View File

@ -1,4 +1,4 @@
args: with args;
args @ { texLive, xz, ... }: with args;
rec {
name = "texlive-extra-2014";
version = "2014.20141024";

View File

@ -1,4 +1,4 @@
args: with args;
args @ {texLive, unzip, ...}: with args;
rec {
version = "1.5.1";
name = "moderncv-${version}";

View File

@ -1,4 +1,4 @@
args: with args;
args @ {texLive, unzip, ...}: with args;
rec {
version = "0.9";
name = "moderntimeline-${version}";

View File

@ -1,4 +1,4 @@
args: with args;
args @ {texLive, ... }: with args;
rec {
name = "texlive-latex-xcolor-2007";
src = fetchurl {

View File

@ -1,10 +1,12 @@
a :
let
a @ {imake, libX11, xproto, gccmakedep, libXt
, libXmu, libXaw, libXext, xextproto, libSM, libICE, libXpm
, libXp, ...} :
let
fetchurl = a.fetchurl;
buildInputs = with a; [
libX11 xproto imake gccmakedep libXt libXmu libXaw
libXext xextproto libSM libICE libXpm libXp
libXext xextproto libSM libICE libXpm libXp
];
in
rec {
@ -29,7 +31,7 @@ rec {
doXMKMF = a.fullDepEntry (''
xmkmf
'') ["doUnpack" "minInit" "addInputs"];
name = "vncrec-0.2"; # version taken from Arch AUR
meta = {
description = "VNC recorder";

File diff suppressed because it is too large Load Diff