ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-27 23:57:42 +03:00
Code Issues Projects Releases Wiki Activity

Merge #19918: mesa: enable intel vulkan driver

Browse Source
This commit is contained in:
Vladimír Čunát 2016-10-28 13:20:47 +02:00
commit f706ab7dbe
22 changed files with 187 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/functions.xml
View File

@ -52,6 +52,20 @@ in ...</programlisting>
It's equivalent to <varname>pkgs</varname> in the above example.
</para>
<para>
Note that in previous versions of nixpkgs, this method replaced any changes from <link
linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>,
along with that from previous calls if this function was called repeatedly.
Now those previous changes will be preserved so this function can be "chained" meaningfully.
To recover the old behavior, make sure <varname>config.packageOverrides<varname> is unset,
and call this only once off a "freshly" imported nixpkgs:
<programlisting>let
pkgs = import &lt;nixpkgs&gt; { config: {}; };
newpkgs = pkgs.overridePackages ...;
in ...</programlisting>
</para>
</section>
<section xml:id="sec-pkg-override">

8
lib/trivial.nix
View File

@ -69,9 +69,13 @@ rec {
#
# nix-repl> obj
# { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; }
makeExtensible = rattrs:
makeExtensible = makeExtensibleWithCustomName "extend";
# Same as `makeExtensible` but the name of the extending attribute is
# customized.
makeExtensibleWithCustomName = extenderName: rattrs:
fix' rattrs // {
extend = f: makeExtensible (extends f rattrs);
${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
};
# Flip the order of the arguments of a binary function.

8
pkgs/applications/misc/chirp/default.nix
View File

@ -2,15 +2,15 @@
, python, pyserial, pygtk
}:
let
version = "0.4.1";
version = "20161018";
in
stdenv.mkDerivation rec {
name = "chirp-${version}";
name = "chirp-daily-${version}";
inherit version;
src = fetchurl {
url = "http://chirp.danplanet.com/download/0.4.1/chirp-${version}.tar.gz";
sha256 = "17iihghqjprn2hld193qw0yl1kkrf6m0fp57l7ibkflxr0nnb7cc";
url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/chirp-daily-${version}.tar.gz";
sha256 = "0f3r919az4vvcgxzqmxvhrxa2byzk5algy7srzzs15ihkvyxcwkb";
};
buildInputs = [

4
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -13,7 +13,7 @@
enableOfficialBranding ? false
}:
let version = "45.3.0"; in
let version = "45.4.0"; in
let verName = "${version}"; in
stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
sha512 = "1226b35535d68b9c088ab8692f61120c99951e1ecbae4739ced711665a3237d248202831831f00536c724e2f6359db4601fa5c90f2793433eab4bd9dab0c1165";
sha512 = "9c601d9625b43103b64e111da3a88fccdc30d4a52aa8a66ee02120bc13f3c5600d24fa1cfd3817975a0e58be9078d192334dd3099aa462468d8ab0cd05a3bcd5";
};
buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx

24
pkgs/development/interpreters/clisp/default.nix
View File

@ -5,18 +5,18 @@
# - full: contains base plus modules in withModules
{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
, libffi, libffcall, coreutils
, libffi
, libffcall
, coreutils
# build options
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
, dllSupport ? true
, withModules ? [
"bindings/glibc"
"pcre"
"rawsock"
"wildcard"
"zlib"
]
++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
++ stdenv.lib.optional x11Support "clx/new-clx"
}:
@ -33,15 +33,17 @@ stdenv.mkDerivation rec {
};
inherit libsigsegv gettext coreutils;
ffcallAvailable = stdenv.isLinux && (libffcall != null);
buildInputs = [libsigsegv]
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (ncurses != null) ncurses
++ stdenv.lib.optional (pcre != null) pcre
++ stdenv.lib.optional (zlib != null) zlib
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (libffi != null) libffi
++ stdenv.lib.optional (libffcall != null) libffcall
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
++ stdenv.lib.optional ffcallAvailable libffcall
++ stdenv.lib.optionals x11Support [
libX11 libXau libXt libXpm xproto libXext xextproto
];
@ -64,8 +66,10 @@ stdenv.mkDerivation rec {
configureFlags = "builddir"
+ stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules"
+ stdenv.lib.optionalString (readline != null) " --with-readline"
+ stdenv.lib.optionalString (libffi != null) " --with-dynamic-ffi"
+ stdenv.lib.optionalString (libffcall != null) " --with-ffcall"
# --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
+ stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi"
+ stdenv.lib.optionalString ffcallAvailable " --with-ffcall"
+ stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall"
+ stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules
+ stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS";
@ -88,6 +92,6 @@ stdenv.mkDerivation rec {
description = "ANSI Common Lisp Implementation";
homepage = http://clisp.cons.org;
maintainers = with stdenv.lib.maintainers; [raskin tohl];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

24
pkgs/development/libraries/Xaw3d/builder.sh
View File

@ -1,24 +0,0 @@
source $stdenv/setup
configurePhase() {
cd lib/Xaw3d
(mkdir X11 && cd X11 && ln -fs .. Xaw3d)
xmkmf
}
buildPhase() {
make depend $makeFlags
make $makeFlags
}
installPhase() {
make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include
cd $out/include/X11 && ln -s Xaw3d Xaw
mkdir -p "$out/nix-support"
echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
}
makeFlags="CDEBUGFLAGS=" # !!! awful hack
genericBuild

51
pkgs/development/libraries/Xaw3d/config.patch
View File

@ -1,51 +0,0 @@
diff -rc xc-orig/lib/Xaw3d/Imakefile xc/lib/Xaw3d/Imakefile
*** xc-orig/lib/Xaw3d/Imakefile 2003-03-08 15:55:18.000000000 +0100
--- xc/lib/Xaw3d/Imakefile 2005-11-11 20:12:24.000000000 +0100
***************
*** 9,15 ****
XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
#define GRAY_BLKWHT_STIPPLES
XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
! #undef ARROW_SCROLLBARS
#define DoNormalLib NormalLibXaw
#define DoSharedLib SharedLibXaw
--- 9,15 ----
XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
#define GRAY_BLKWHT_STIPPLES
XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
! #define ARROW_SCROLLBARS
#define DoNormalLib NormalLibXaw
#define DoSharedLib SharedLibXaw
***************
*** 22,28 ****
#define IncSubSubdir Xaw3d
XCOMM When building outside an X11 source tree:
! XCOMM EXTRA_INCLUDES = -I.
#ifdef SharedXawReqs
REQUIREDLIBS = SharedXawReqs
--- 22,28 ----
#define IncSubSubdir Xaw3d
XCOMM When building outside an X11 source tree:
! EXTRA_INCLUDES = -I.
#ifdef SharedXawReqs
REQUIREDLIBS = SharedXawReqs
diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l
*** xc-orig/lib/Xaw3d/laylex.l 1996-10-15 16:41:26.000000000 +0200
--- xc/lib/Xaw3d/laylex.l 2005-11-11 20:03:50.000000000 +0100
***************
*** 26,31 ****
--- 26,33 ----
#ifdef __STDC__
static int count ();
#endif
+
+ static int LayYY_prev_more_offset = 0;
%}
%%
vertical return VERTICAL;

14
pkgs/development/libraries/Xaw3d/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}:
stdenv.mkDerivation {
name = "Xaw3d-1.5E";
builder = ./builder.sh;
name = "Xaw3d-1.6.2";
src = fetchurl {
url = http://freshmeat.net/redir/xaw3d/11835/url_tgz/Xaw3d-1.5E.tar.gz;
md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
urls = [
ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.tar.bz2
];
sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi";
};
patches = [./config.patch ./laylex.patch];
buildInputs = [imake gccmakedep libXpm libXp bison flex];
buildInputs = [imake gccmakedep libXpm libXp bison flex pkgconfig];
propagatedBuildInputs = [xlibsWrapper libXmu];
meta = {

13
pkgs/development/libraries/Xaw3d/laylex.patch
View File

@ -1,13 +0,0 @@
diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l
*** xc-orig/lib/Xaw3d/laylex.l 2006-08-07 12:12:54.000000000 +0200
--- xc/lib/Xaw3d/laylex.l 2006-08-07 12:14:49.000000000 +0200
***************
*** 27,33 ****
static int count ();
#endif
- static int LayYY_prev_more_offset = 0;
%}
%%
vertical return VERTICAL;
--- 27,32 ----

4
pkgs/development/libraries/git2/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }:
stdenv.mkDerivation (rec {
version = "0.24.1";
version = "0.24.2";
name = "libgit2-${version}";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/libgit2/libgit2/tarball/v${version}";
sha256 = "0rw80480dx2f6a2wbb1bwixygg1iwq3r7vwhxdmkkf4lpxd35jhd";
sha256 = "0avijw83vfx64cn23vx2j1h14zmkx8silgjnq6q2qw2z3sh73hs1";
};
# TODO: `cargo` (rust's package manager) surfaced a serious bug in

21
pkgs/development/libraries/mesa/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch
, pkgconfig, intltool, autoreconfHook, substituteAll
, file, expat, libdrm, xorg, wayland, systemd
, file, expat, libdrm, xorg, wayland, systemd, openssl
, llvmPackages, libffi, libomxil-bellagio, libva
, libelf, libvdpau, python2
, grsecEnabled ? false
@ -71,11 +71,13 @@ stdenv.mkDerivation {
"--with-dri-driverdir=$(drivers)/lib/dri"
"--with-dri-searchpath=${driverLink}/lib/dri"
"--with-egl-platforms=x11,wayland,drm"
(optionalString (stdenv.system != "armv7l-linux")
"--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast")
(optionalString (stdenv.system != "armv7l-linux")
"--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast")
]
++ optionals (stdenv.system != "armv7l-linux") [
"--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
"--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
"--with-vulkan-drivers=intel"
]
++ [
(enableFeature enableTextureFloats "texture-float")
(enableFeature grsecEnabled "glx-rts")
(enableFeature stdenv.isLinux "dri3")
@ -112,7 +114,7 @@ stdenv.mkDerivation {
glproto dri2proto dri3proto presentproto
libX11 libXext libxcb libXt libXfixes libxshmfence
libffi wayland libvdpau libelf libXvMC
libomxil-bellagio libva libpthreadstubs
libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
(python2.withPackages (ps: [ ps.Mako ]))
] ++ optional stdenv.isLinux systemd;
@ -134,8 +136,13 @@ stdenv.mkDerivation {
$out/lib/vdpau \
$out/lib/bellagio \
$out/lib/libxatracker* \
$out/lib/libvulkan_* \
# move share/vulkan/icd.d/
mv $out/share/ $drivers/
mv $out/lib/dri/* $drivers/lib/dri
rmdir "$out/lib/dri"
# move libOSMesa to $osmesa, as it's relatively big
mkdir -p {$osmesa,$drivers}/lib/

15
pkgs/development/libraries/openslp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation {
name = "openslp-2.0.0";
@ -8,6 +8,19 @@ stdenv.mkDerivation {
sha256 = "16splwmqp0400w56297fkipaq9vlbhv7hapap8z09gp5m2i3fhwj";
};
patches = [
(fetchpatch {
name = "openslp-2.0.0-null-pointer-deref.patch";
url = "https://svnweb.mageia.org/packages/cauldron/openslp/current/SOURCES/openslp-2.0.0-null-pointer-deref.patch?revision=1019712&view=co";
sha256 = "186f3rj3z2lf5h1lpbhqk0szj2a9far1p3mjqg6422f29yjfnz6a";
})
(fetchpatch {
name = "openslp-2.0.0-CVE-2016-7567.patch";
url = "https://svnweb.mageia.org/packages/cauldron/openslp/current/SOURCES/openslp-2.0.0-CVE-2016-7567.patch?revision=1057233&view=co";
sha256 = "1zrgql91vjjl2v7brlibc8jqndnjz9fclqbdn0b6fklkpwznprny";
})
];
meta = with stdenv.lib; {
homepage = "http://openslp.org/";
description = "An open-source implementation of the IETF Service Location Protocol";

4
pkgs/development/tools/cdecl/default.nix
View File

@ -3,8 +3,8 @@
stdenv.mkDerivation {
name = "cdecl-2.5";
src = fetchurl {
url = "http://cdecl.org/files/cdecl-blocks-2.5.tar.gz";
md5 = "c1927e146975b1c7524cbaf07a7c10f8";
url = "http://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz";
sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly";
};
patches = [ ./cdecl-2.5-lex.patch ];

6
pkgs/development/tools/misc/saleae-logic/default.nix
View File

@ -25,7 +25,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
pname = "saleae-logic";
version = "1.2.9";
version = "1.2.10";
name = "${pname}-${version}";
src =
@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
fetchurl {
name = "saleae-logic-${version}-32bit.zip";
url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip";
sha256 = "0000004xgv8v8l12shimhhn54nn0dldbxz1gpbx92ysd8q8x1q79";
sha256 = "1dyrj07cgj2fvwi1sk97vady9ri8f8n7mxy9zyzmw9isngs7bmll";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
name = "saleae-logic-${version}-64bit.zip";
url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip";
sha256 = "1d4hmp756ysfk5i1ys4mlkd1czbdw0zqznkzx08pyqk93zc7b16s";
sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7";
}
else
abort "Saleae Logic software requires i686-linux or x86_64-linux";

4
pkgs/os-specific/linux/kernel/linux-4.1.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.1.33";
version = "4.1.35";
extraMeta.branch = "4.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "15ms5mvvf0wpmscv8l5irp4j7j3l6k61hcjx9ln41pz6si00zj3l";
sha256 = "0jn09hs91d5fi6615v9fnbpggyh1x192q6faggpbb90q110g0jjl";
};
kernelPatches = args.kernelPatches;

6
pkgs/os-specific/linux/wireguard/default.nix
View File

@ -8,11 +8,11 @@ assert kernel != null -> !(kernel.features.grsecurity or false);
let
name = "wireguard-unstable-${version}";
version = "2016-10-01";
version = "2016-10-25";
src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20161001.tar.xz";
sha256 = "1j1s276lgp17yrlc46bgsbpwp635cvvv6b3ap49aq5h7jixvnfmc";
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20161025.tar.xz";
sha256 = "09rhap3dzb8rcq1a1af9inf1qz7161yghafbgpbnd9dg016vhgs3";
};
meta = with stdenv.lib; {

4
pkgs/servers/apache-kafka/default.nix
View File

@ -11,9 +11,9 @@ let
scalaVersion = "2.11";
sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
};
"0.10" = { kafkaVersion = "0.10.0.1";
"0.10" = { kafkaVersion = "0.10.1.0";
scalaVersion = "2.11";
sha256 = "0bdhzbhmm87a47162hyazcjmfibqg9r3ryzfjag7r0nxxmd64wrd";
sha256 = "144k6bqg8q8f3x3nk05hvaaad8xa32qjifg785i15j69cnp355bd";
};
};
in

4
pkgs/servers/bird/default.nix
View File

@ -2,11 +2,11 @@
, enableIPv6 ? false }:
stdenv.mkDerivation rec {
name = "bird-1.6.0";
name = "bird-1.6.2";
src = fetchurl {
url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
sha256 = "04qf07cb04xdjnq0qxj6y8iqwyszk1vyark9gn5v6wxcvqvzwgfv";
sha256 = "1xlq78mgfyh9yvg9zld9mx75bxg9ajbn4cjjchnf0msh0ibzhlw8";
};
buildInputs = [ flex bison readline ];

7
pkgs/tools/security/gencfsm/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
, glib , gnome3, gtk3, libgnome_keyring, vala_0_23, wrapGAppsHook, xorg }:
, glib , gnome3, gtk3, libgnome_keyring, vala_0_23, wrapGAppsHook, xorg
, libgee_0_6
}:
stdenv.mkDerivation rec {
version = "1.8.16";
@ -11,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ autoconf automake intltool libtool pkgconfig vala_0_23 glib encfs
gtk3 libgnome_keyring gnome3.libgee_1 xorg.libSM xorg.libICE
gtk3 libgnome_keyring libgee_0_6 xorg.libSM xorg.libICE
wrapGAppsHook ];
patches = [ ./makefile-mkdir.patch ];
@ -30,5 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.spacefrogg ];
broken = true;
};
}

4
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl
, texlive
, zlib, bzip2, ncurses, libpng, flex, bison, libX11, libICE, xproto
, zlib, bzip2, ncurses, libiconv, libpng, flex, bison, libX11, libICE, xproto
, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
@ -296,7 +296,7 @@ xindy = stdenv.mkDerivation {
pkgconfig perl
(texlive.combine { inherit (texlive) scheme-basic cyrillic ec; })
];
buildInputs = [ clisp ];
buildInputs = [ clisp libiconv ];
configureFlags = [ "--with-clisp-runtime=system" "--disable-xindy-docs" ];

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

@ -6,7 +6,6 @@
* Hint: ### starts category names.
*/
{ system, bootStdenv, noSysDirs, config, crossSystem, platform, lib
, pkgsWithOverrides
, ... }:
self: pkgs:
@ -35,19 +34,6 @@ in
newScope = extra: lib.callPackageWith (defaultScope // extra);
# Easily override this package set.
# Warning: this function is very expensive and must not be used
# from within the nixpkgs repository.
#
# Example:
# pkgs.overridePackages (self: super: {
# foo = super.foo.override { ... };
# }
#
# The result is `pkgs' where all the derivations depending on `foo'
# will use the new version.
overridePackages = f: pkgsWithOverrides f;
# Override system. This is useful to build i686 packages on x86_64-linux.
forceSystem = system: kernel: (import ../..) {
inherit system;
@ -698,6 +684,7 @@ in
caddy = callPackage ../servers/caddy { };
calamares = qt5.callPackage ../tools/misc/calamares rec {
python = python3;
boost = pkgs.boost.override { python=python3; };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost=boost; };
};
@ -1032,7 +1019,9 @@ in
burp = callPackage ../tools/backup/burp { };
buku = callPackage ../applications/misc/buku {};
buku = callPackage ../applications/misc/buku {
pythonPackages = python3Packages;
};
byzanz = callPackage ../applications/video/byzanz {};
@ -1387,6 +1376,8 @@ in
diffoscope = callPackage ../tools/misc/diffoscope {
jdk = jdk7;
pythonPackages = python3Packages;
rpm = rpm.override { python = python3; };
};
diffstat = callPackage ../tools/text/diffstat { };
@ -2905,7 +2896,9 @@ in
notify-osd = callPackage ../applications/misc/notify-osd { };
nox = callPackage ../tools/package-management/nox {};
nox = callPackage ../tools/package-management/nox {
pythonPackages = python3Packages;
};
nq = callPackage ../tools/system/nq { };
@ -3758,6 +3751,7 @@ in
system-config-printer = callPackage ../tools/misc/system-config-printer {
libxml2 = libxml2Python;
pythonPackages = python3Packages;
};
sitecopy = callPackage ../tools/networking/sitecopy { };
@ -4785,16 +4779,19 @@ in
version = "4.7-2013q3-20130916";
releaseType = "update";
sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d";
ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
version = "4.8-2014q1-20140314";
releaseType = "update";
sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
version = "4.9-2015q1-20150306";
releaseType = "update";
sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154";
ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded-5 = pkgs.callPackage_i686 ../development/compilers/gcc-arm-embedded {
dirName = "5.0";
@ -4802,6 +4799,7 @@ in
version = "5.4-2016q2-20160622";
releaseType = "update";
sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r";
ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded = gcc-arm-embedded-5;
@ -5562,7 +5560,7 @@ in
pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
pypi2nix = callPackage ../development/tools/pypi2nix {};
pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; };
svg2tikz = python27Packages.svg2tikz;
@ -6197,7 +6195,9 @@ in
ninja = callPackage ../development/tools/build-managers/ninja { };
nixbang = callPackage ../development/tools/misc/nixbang {};
nixbang = callPackage ../development/tools/misc/nixbang {
pythonPackages = python3Packages;
};
nexus = callPackage ../development/tools/repository-managers/nexus { };
@ -9207,7 +9207,7 @@ in
stlport = callPackage ../development/libraries/stlport { };
streamlink = callPackage ../applications/video/streamlink {};
streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; };
strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
@ -12178,6 +12178,7 @@ in
blender = callPackage ../applications/misc/blender {
cudatoolkit = cudatoolkit75;
python = python35;
};
bluefish = callPackage ../applications/editors/bluefish {
@ -12721,7 +12722,9 @@ in
eq10q = callPackage ../applications/audio/eq10q { };
errbot = callPackage ../applications/networking/errbot {};
errbot = callPackage ../applications/networking/errbot {
pythonPackages = python3Packages;
};
espeak-classic = callPackage ../applications/audio/espeak { };
@ -14118,7 +14121,9 @@ in
purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { };
pithos = callPackage ../applications/audio/pithos {};
pithos = callPackage ../applications/audio/pithos {
pythonPackages = python3Packages;
};
pinfo = callPackage ../applications/misc/pinfo { };
@ -15408,7 +15413,9 @@ in
bastet = callPackage ../games/bastet {};
beancount = callPackage ../applications/office/beancount {};
beancount = callPackage ../applications/office/beancount {
pythonPackages = python3Packages;
};
bean-add = callPackage ../applications/office/beancount/bean-add.nix { };
@ -17292,7 +17299,9 @@ in
webfs = callPackage ../servers/http/webfs { };
wikicurses = callPackage ../applications/misc/wikicurses {};
wikicurses = callPackage ../applications/misc/wikicurses {
pythonPackages = python3Packages;
};
wineMinimal = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable";

105
pkgs/top-level/default.nix
View File

@ -61,6 +61,35 @@ let
inherit system bootStdenv noSysDirs config crossSystem platform lib;
};
stdenvAdapters = self: super:
let res = import ../stdenv/adapters.nix self; in res // {
stdenvAdapters = res;
};
trivialBuilders = self: super:
(import ../build-support/trivial-builders.nix {
inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
});
stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs;
allPackages = self: super:
let res = import ./all-packages.nix topLevelArguments res self;
in res;
aliases = self: super: import ./aliases.nix super;
# stdenvOverrides is used to avoid circular dependencies for building
# the standard build environment. This mechanism uses the override
# mechanism to implement some staged compilation of the stdenv.
#
# We don't want stdenv overrides in the case of cross-building, or
# otherwise the basic overridden packages will not be built with the
# crossStdenv adapter.
stdenvOverrides = self: super:
lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides)
(super.stdenv.overrides super);
# Allow packages to be overridden globally via the `packageOverrides'
# configuration option, which must be a function that takes `pkgs'
# as an argument and returns a set of new or overridden packages.
@ -68,54 +97,34 @@ let
# (un-overridden) set of packages, allowing packageOverrides
# attributes to refer to the original attributes (e.g. "foo =
# ... pkgs.foo ...").
pkgs = pkgsWithOverrides (self: config.packageOverrides or (super: {}));
configOverrides = self: super:
lib.optionalAttrs (bootStdenv == null)
((config.packageOverrides or (super: {})) super);
# Return the complete set of packages, after applying the overrides
# returned by the `overrider' function (see above). Warning: this
# function is very expensive!
pkgsWithOverrides = overrider:
let
stdenvAdapters = self: super:
let res = import ../stdenv/adapters.nix self; in res // {
stdenvAdapters = res;
};
# The complete chain of package set builders, applied from top to bottom
toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [
stdenvAdapters
trivialBuilders
stdenvDefault
allPackages
aliases
stdenvOverrides
configOverrides
];
trivialBuilders = self: super:
(import ../build-support/trivial-builders.nix {
inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
});
# Use `overridePackages` to easily override this package set.
# Warning: this function is very expensive and must not be used
# from within the nixpkgs repository.
#
# Example:
# pkgs.overridePackages (self: super: {
# foo = super.foo.override { ... };
# }
#
# The result is `pkgs' where all the derivations depending on `foo'
# will use the new version.
stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs;
allPackagesArgs = topLevelArguments // { inherit pkgsWithOverrides; };
allPackages = self: super:
let res = import ./all-packages.nix allPackagesArgs res self;
in res;
aliases = self: super: import ./aliases.nix super;
# stdenvOverrides is used to avoid circular dependencies for building
# the standard build environment. This mechanism uses the override
# mechanism to implement some staged compilation of the stdenv.
#
# We don't want stdenv overrides in the case of cross-building, or
# otherwise the basic overridden packages will not be built with the
# crossStdenv adapter.
stdenvOverrides = self: super:
lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides)
(super.stdenv.overrides super);
customOverrides = self: super:
lib.optionalAttrs (bootStdenv == null) (overrider self super);
in
lib.fix' (
lib.extends customOverrides (
lib.extends stdenvOverrides (
lib.extends aliases (
lib.extends allPackages (
lib.extends stdenvDefault (
lib.extends trivialBuilders (
lib.extends stdenvAdapters (
self: {}))))))));
in
pkgs
# Return the complete set of packages. Warning: this function is very
# expensive!
pkgs = lib.makeExtensibleWithCustomName "overridePackages" toFix;
in pkgs