all-packages: Use callPackage where possible
This commit is contained in:
Mathnerd314
parent
7fb1c7efcf
commit
eb7404d97a
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { libXt, libX11, libXext, xextproto, xproto, gsl, aalib, zlib, intltool, gettext, perl, ... }:
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { libgphoto2, fuse, pkgconfig, glib, libtool, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
s = import ./src-info-for-gphotofs.nix;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
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
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, libXcursor, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# trivial builder for Emacs packages
|
||||
|
||||
{ lib, ... }@envargs:
|
||||
{ lib, stdenv, texinfo, ... }@envargs:
|
||||
|
||||
with lib;
|
||||
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args: with args; rec {
|
||||
args @ { fetchurl, fontforge, lib, ... }: with args; rec {
|
||||
name = "linux-libertine-5.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
a :
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args : with args;
|
||||
args @ { makeWrapper, ruby, ... }: with args;
|
||||
|
||||
rec {
|
||||
name = "rubygems-" + version;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ x@{builderDefsPackage
|
|||
builderDefsPackage
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
helperArgNames = ["stdenv" "fetchsvn" "builderDefsPackage"] ++
|
||||
[];
|
||||
|
||||
buildInputs = map (n: builtins.getAttr n x)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { tcsh, mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, ... }:
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ {python, ...} :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { python, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ {python, setuptools, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { mesa, SDL, SDL_image, SDL_mixer, ... } :
|
||||
let
|
||||
s = import ./src-for-default.nix;
|
||||
buildInputs = with a; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args : with args;
|
||||
args @ { libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib, ... }: with args;
|
||||
let
|
||||
version = lib.attrByPath ["version"] "1.12.1" args;
|
||||
sha256 = lib.attrByPath ["sha256"]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
a :
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ {libX11, xproto, libXpm, libXt, ...} :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { ncurses, flex, bison, autoconf, automake, m4, coreutils, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { libjpeg, pkgconfig, zlib, directfb, xproto, ... } :
|
||||
let
|
||||
s = import ./src-for-default.nix;
|
||||
buildInputs = with a; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "3.10.87";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "3.12.47";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "3.14.51";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "3.18.21";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.1.6";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.2";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.2-rc5";
|
||||
|
|
|
|||
|
|
@ -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 {} {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { xmpppy, pythonIRClib, python, makeWrapper, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { xmpppy, python, makeWrapper, fetchcvs, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { zlib, libpng, freetype, gd, which, libxml2, geoip, ... } :
|
||||
let
|
||||
s = import ./src-for-default.nix;
|
||||
buildInputs = with a; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { cmake, patchelf, imagemagick, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { intltool, perl, gettext, libusb, pkgconfig, bluez, readline, pcsclite, libical, gtk, glib, libXpm, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { openssl, gmp, nettools, iproute, zlib, ... } :
|
||||
let
|
||||
s = import ./src-for-default.nix;
|
||||
buildInputs = with a; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ {ppp, ...} :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args :
|
||||
args @ {unzip, ... } :
|
||||
let
|
||||
lib = args.lib;
|
||||
fetchurl = args.fetchurl;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ { groff, ... } :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a :
|
||||
a @ {pciutils, libx86, zlib, ...} :
|
||||
let
|
||||
s = import ./src-for-default.nix;
|
||||
buildInputs = with a; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args : with args;
|
||||
args @ {poppler, perl, makeWrapper, ... }: with args;
|
||||
rec {
|
||||
name = "TeXLive-linkdir";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args: with args;
|
||||
args @ {texLiveLatexXColor, texLivePGF, texLive, ...}: with args;
|
||||
rec {
|
||||
name = "texlive-beamer-2013";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args: with args;
|
||||
args @ {texLive, ...}: with args;
|
||||
rec {
|
||||
name = "texlive-cm-super-2009";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args: with args;
|
||||
args @ { texLive, ... }: with args;
|
||||
rec {
|
||||
name = "context-2014.05.21";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args: with args;
|
||||
args @ { texLive, xz, ... }: with args;
|
||||
rec {
|
||||
name = "texlive-extra-2014";
|
||||
version = "2014.20141024";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args: with args;
|
||||
args @ {texLive, unzip, ...}: with args;
|
||||
rec {
|
||||
version = "1.5.1";
|
||||
name = "moderncv-${version}";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args: with args;
|
||||
args @ {texLive, unzip, ...}: with args;
|
||||
rec {
|
||||
version = "0.9";
|
||||
name = "moderntimeline-${version}";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args: with args;
|
||||
args @ {texLive, ... }: with args;
|
||||
rec {
|
||||
name = "texlive-latex-xcolor-2007";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
a :
|
||||
a @ {imake, libX11, xproto, gccmakedep, libXt
|
||||
, libXmu, libXaw, libXext, xextproto, libSM, libICE, libXpm
|
||||
, libXp, ...} :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue