ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-24 20:02:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge recent staging

Browse Source 
It's almost finished by Hydra now.
This commit is contained in:
Vladimír Čunát 2017-02-12 19:51:01 +01:00
commit 2dba30af72
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
11 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/audio/guitarix/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python2
, avahi, bluez, boost, eigen, fftw, glib, glib_networking
, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
, ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p";
};
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ];
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
buildInputs = [
avahi bluez boost eigen fftw glib glibmm glib_networking.out
@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
"--no-faust" # todo: find out why --faust doesn't work
] ++ optional optimizationSupport "--optimization";
configurePhase = ''python waf configure --prefix=$out $configureFlags'';
configurePhase = ''python2 waf configure --prefix=$out $configureFlags'';
buildPhase = ''python waf build'';
buildPhase = ''python2 waf build'';
installPhase = ''python waf install'';
installPhase = ''python2 waf install'';
meta = with stdenv.lib; {
description = "A virtual guitar amplifier for Linux running with JACK";

5
pkgs/applications/misc/ranger/default.nix
View File

@ -15,8 +15,13 @@ pythonPackages.buildPythonApplication rec {
sha256 = "14j067n1azk6vc6cxlhi5w5bsn2wcz4hypvgxc0vjl9xp5n4f0nf";
};
checkInputs = with pythonPackages; [ pytest ];
propagatedBuildInputs = [ file ];
checkPhase = ''
py.test tests
'';
preConfigure = ''
substituteInPlace ranger/ext/img_display.py \
--replace /usr/lib/w3m ${w3m}/libexec/w3m

8
pkgs/applications/science/misc/golly/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, wxGTK, perl, python, zlib, mesa, libX11}:
{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}:
let
s = # Generated upstream information
rec {
@ -10,7 +10,7 @@ let
sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
};
buildInputs = [
wxGTK perl python zlib mesa libX11
wxGTK perl python2 zlib mesa libX11
];
in
stdenv.mkDerivation rec {
@ -26,12 +26,12 @@ stdenv.mkDerivation rec {
makeFlags=[
"AM_LDFLAGS="
];
NIX_LDFLAGS="-lpython${python.majorVersion} -lperl";
NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl";
preConfigure=''
export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
-DPYTHON_SHLIB=$(basename "$(
readlink -f ${python}/lib/libpython*.so)")"
readlink -f ${python2}/lib/libpython*.so)")"
'';
meta = {

8
pkgs/development/compilers/llvm/3.9/llvm.nix
View File

@ -1,5 +1,6 @@
{ stdenv
, fetch
, fetchpatch
, perl
, groff
, cmake
@ -45,6 +46,13 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ ncurses zlib ];
postPatch = ""
+ ''
patch -p1 --reverse < ${fetchpatch {
name = "fix-red-icons.diff"; # https://bugs.freedesktop.org/show_bug.cgi?id=99078
url = https://github.com/llvm-mirror/llvm/commit/c280d74837d8.diff;
sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf";
}}
''
# hacky fix: New LLVM releases require a newer OS X SDK than
# 10.9. This is a temporary measure until nixpkgs darwin support is
# updated.

1
pkgs/development/libraries/SDL/default.nix
View File

@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
# Workaround X11 bug to allow changing gamma
# Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
(fetchpatch {
name = "SDL_SetGamma.patch";
url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv";
})

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, python, swig, gd, libxml2, tcl, libusb, pkgconfig,
{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb, pkgconfig,
boost, libtool, perlPackages }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0ppp6fc2h9d8p30j2s9wlqd620kmnny4wd8fc3jxd6gxwi4lbjm2";
};
buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python swig gd libxml2
buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2
tcl libusb pkgconfig boost libtool ];
configureFlags = [ "--with-perl-binding" "--with-python-binding"

8
pkgs/development/libraries/nghttp2/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig
# Optional Dependencies
, openssl ? null, libev ? null, zlib ? null
, openssl ? null, libev ? null, zlib ? null, libcares ? null
, enableHpack ? false, jansson ? null
, enableAsioLib ? false, boost ? null
, enableGetAssets ? false, libxml2 ? null
@ -17,18 +17,18 @@ with { inherit (stdenv.lib) optional; };
stdenv.mkDerivation rec {
name = "nghttp2-${version}";
version = "1.17.0";
version = "1.19.0";
# Don't use fetchFromGitHub since this needs a bootstrap curl
src = fetchurl {
url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a";
sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a";
};
outputs = [ "out" "dev" "lib" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl libev zlib ]
buildInputs = [ openssl libev zlib libcares ]
++ optional enableHpack jansson
++ optional enableAsioLib boost
++ optional enableGetAssets libxml2

36
pkgs/servers/x11/xorg/default.nix
View File

@ -812,11 +812,11 @@ let
}) // {inherit fontconfig freetype libX11 xproto libXrender ;};
libXi = (mkDerivation "libXi" {
name = "libXi-1.7.8";
name = "libXi-1.7.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2;
sha256 = "1fr7mi4nbcxsa88qin9g2ipmzh595ydxy9qnabzl270laf6zmwnq";
url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2;
sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2";
};
buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@ -856,11 +856,11 @@ let
}) // {inherit printproto libX11 libXau libXext xextproto ;};
libXpm = (mkDerivation "libXpm" {
name = "libXpm-3.5.11";
name = "libXpm-3.5.12";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2;
sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2;
sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
};
buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
meta.platforms = stdenv.lib.platforms.unix;
@ -1120,11 +1120,11 @@ let
}) // {inherit libfontenc freetype xproto zlib ;};
presentproto = (mkDerivation "presentproto" {
name = "presentproto-1.0";
name = "presentproto-1.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/proto/presentproto-1.0.tar.bz2;
sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2;
sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn";
};
buildInputs = [pkgconfig ];
meta.platforms = stdenv.lib.platforms.unix;
@ -1241,11 +1241,11 @@ let
}) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
utilmacros = (mkDerivation "utilmacros" {
name = "util-macros-1.19.0";
name = "util-macros-1.19.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2;
sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2;
sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q";
};
buildInputs = [pkgconfig ];
meta.platforms = stdenv.lib.platforms.unix;
@ -1285,11 +1285,11 @@ let
}) // {inherit libX11 libXext libXft libXmu xproto libXrender ;};
xauth = (mkDerivation "xauth" {
name = "xauth-1.0.9";
name = "xauth-1.0.10";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xauth-1.0.9.tar.bz2;
sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2;
sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs";
};
buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@ -2254,11 +2254,11 @@ let
}) // {inherit inputproto libX11 libXaw xproto libXt ;};
xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
name = "xkeyboard-config-2.19";
name = "xkeyboard-config-2.20";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2;
sha256 = "09sqyi430bbg13pp8j0j60p9p9xn2lpqx38xw1lyv77bp63d3pw3";
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2;
sha256 = "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi";
};
buildInputs = [pkgconfig libX11 xproto ];
meta.platforms = stdenv.lib.platforms.unix;

12
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@ -6,7 +6,7 @@ mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2
mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2
mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2
mirror://xorg/individual/proto/presentproto-1.0.tar.bz2
mirror://xorg/individual/proto/presentproto-1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
@ -71,11 +71,11 @@ mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2
mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2
mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2
mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2
mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2
@ -100,11 +100,11 @@ mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2
mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
mirror://xorg/individual/app/twm-1.0.9.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2
mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
mirror://xorg/individual/app/xauth-1.0.9.tar.bz2
mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
@ -177,7 +177,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2
mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2
mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2

4
pkgs/tools/text/gnugrep/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, pcre, libiconv, perl }:
let version = "2.27"; in
let version = "3.0"; in
stdenv.mkDerivation {
name = "gnugrep-${version}";
src = fetchurl {
url = "mirror://gnu/grep/grep-${version}.tar.xz";
sha256 = "1syadppgpxpfhpwhhqcsibrn131azypzps5aicx1qjh74d6w8k5d";
sha256 = "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72";
};
# Perl is needed for testing

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

@ -7778,7 +7778,9 @@ with pkgs;
jsoncpp = callPackage ../development/libraries/jsoncpp { };
jsonnet = callPackage ../development/compilers/jsonnet { };
jsonnet = callPackage ../development/compilers/jsonnet {
emscripten = emscripten.override {python=python2;};
};
libjson = callPackage ../development/libraries/libjson { };