mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

Revert "Merge pull request #9543 from NixOS/staging.post-15.06"

Browse source 
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
This commit is contained in:
Eelco Dolstra 2015-10-06 15:24:20 +02:00
parent fe195af944
commit 741bf840da
53 changed files with 385 additions and 652 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
doc/haskell-users-guide.md
View file

@ -666,27 +666,6 @@ to find out the store path of the system's zlib library. Now, you can
The same thing applies to `cabal configure`, of course, if you're
building with `cabal-install` instead of Stack.
## Creating statically linked binaries
There are two levels of static linking. The first option is to configure the
build with the Cabal flag `--disable-executable-dynamic`. In Nix expressions,
this can be achieved by setting the attribute:
enableSharedExecutables = false;
That gives you a binary with statically linked Haskell libraries and
dynamically linked system libraries.
To link both Haskell libraries and system libraries statically, the additional
flags `--ghc-option=-optl=-static --ghc-option=-optl=-pthread` need to be used.
In Nix, this is accomplished with:
configureFlags = [ "--ghc-option=-optl=-static" "--ghc-option=-optl=-pthread" ];
It's important to realize, however, that most system libraries in Nix are built
as shared libraries only, i.e. there is just no static library available that
Cabal could link!
# Other resources

2
lib/maintainers.nix
View file

@ -144,7 +144,6 @@
jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
jzellner = "Jeff Zellner <jeffz@eml.cc>";
kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>";
khumba = "Bryan Gardiner <bog@khumba.net>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
koral = "Koral <koral@mailoo.org>";
@ -180,7 +179,6 @@
meditans = "Carlo Nucera <meditans@gmail.com>";
meisternu = "Matt Miemiec <meister@krutt.org>";
michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
modulistic = "Pablo Costa <modulistic@gmail.com>";

20
nixos/modules/services/mail/opensmtpd.nix
View file

@ -46,17 +46,6 @@ in {
is left empty, the OpenSMTPD server will not start.
'';
};
procPackages = mkOption {
type = types.listOf types.path;
default = [];
description = ''
Packages to search for filters, tables, queues, and schedulers.
Add OpenSMTPD-extras here if you want to use the filters, etc. from
that package.
'';
};
};
};
@ -83,19 +72,12 @@ in {
};
};
systemd.services.opensmtpd = let
procEnv = pkgs.buildEnv {
name = "opensmtpd-procs";
paths = [ opensmtpd ] ++ cfg.procPackages;
pathsToLink = [ "/libexec/opensmtpd" ];
};
in {
systemd.services.opensmtpd = {
wantedBy = [ "multi-user.target" ];
wants = [ "network.target" ];
after = [ "network.target" ];
preStart = "mkdir -p /var/spool";
serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
};
environment.systemPackages = [ (pkgs.runCommand "opensmtpd-sendmail" {} ''

5
nixos/modules/services/networking/networkmanager.nix
View file

@ -71,10 +71,11 @@ let
${coreutils}/bin/rm -f $tmp $tmp.ns
'';
# pre-up and pre-down hooks were added in NM 0.9.10, but we still use 0.9.0
dispatcherTypesSubdirMap = {
"basic" = "";
"pre-up" = "pre-up.d/";
"pre-down" = "pre-down.d/";
/*"pre-up" = "pre-up.d/";
"pre-down" = "pre-down.d/";*/
};
in {

2
nixos/modules/tasks/network-interfaces.nix
View file

@ -59,7 +59,7 @@ let
# place the interface which is named after the device at the beginning.
wlanListDeviceFirst = device: interfaces:
if hasAttr device interfaces
then mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n==device) interfaces) ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces)
then [{"${device}"=interfaces.device; _iName=device;}] ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces)
else mapAttrsToList (n: v: v // {_iName = n;}) interfaces;
# udev script that configures a physical wlan device and adds virtual interfaces

8
pkgs/applications/audio/audacity/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */
}:
stdenv.mkDerivation rec {
@ -19,13 +19,11 @@ stdenv.mkDerivation rec {
rm -r lib-src-rm/
'';
configureFlags = "--with-libsamplerate";
buildInputs = [
pkgconfig gettext wxGTK gtk expat alsaLib
libsndfile soxr libid3tag
ffmpeg libmad lame libvorbis flac soundtouch
]; #ToDo: detach sbsms
ffmpeg libmad lame libvorbis flac
]; #ToDo: soundtouch, detach sbsms
dontDisableStatic = true;
doCheck = true;

35
pkgs/applications/audio/jackmix/default.nix
View file

@ -1,35 +0,0 @@
{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }:
stdenv.mkDerivation rec {
name = "jackmix-0.5.2";
src = fetchurl {
url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz;
sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j";
};
buildInputs = [
pkgs.pkgconfig
pkgs.scons
pkgs.kde4.qt4
pkgs.lash
jack
];
buildPhase = ''
scons
'';
installPhase = ''
mkdir -p $out/bin
cp jackmix/jackmix $out/bin
'';
meta = {
description = "Matrix-Mixer for the Jack-Audio-connection-Kit";
homepage = http://www.arnoldarts.de/jackmix/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.kampfschlaefer ];
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/applications/graphics/gimp/plugins/default.nix
View file

@ -245,7 +245,7 @@ rec {
/* =============== simple script files ==================== */
# also have a look at enblend-enfuse in all-packages.nix
# also have a look at enblendenfuse in all-packages.nix
exposureBlend = scriptDerivation {
name = "exposure-blend";
src = fetchurl {

4
pkgs/applications/graphics/hugin/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, cmake, fetchurl, gnumake, pkgconfig
, boost, gettext, tclap, wxGTK
, freeglut, glew, libXi, libXmu, mesa
, autopanosiftc, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff
, autopanosiftc, enblendenfuse, exiv2, ilmbase, lensfun, libpng, libtiff
, openexr, panotools, perlPackages
}:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
# commandline tools needed by the hugin batch processor
# you may have to tell hugin (in the preferences) where these binaries reside
propagatedUserEnvPackages = [ autopanosiftc enblend-enfuse gnumake
propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake
perlPackages.ImageExifTool
];

6
pkgs/applications/networking/ids/daq/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}:
{stdenv, fetchurl, flex, bison, libpcap}:
stdenv.mkDerivation rec {
name = "daq-2.0.5";
@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p";
};
buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue];
configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib";
buildInputs = [ flex bison libpcap ];
meta = {
description = "Data AcQuisition library (DAQ), for packet I/O";

12
pkgs/applications/networking/ids/snort/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, makeWrapper, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
stdenv.mkDerivation rec {
version = "2.9.7.2";
@ -10,15 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv";
};
buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ];
enableParallelBuilding = true;
configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine";
postInstall = ''
wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq"
'';
buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];
meta = {
description = "Network intrusion prevention and detection system (IDS/IPS)";

44
pkgs/applications/networking/iptraf-ng/default.nix
View file

@ -1,44 +0,0 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
version = "1.1.4";
name = "iptraf-ng-${version}";
src = fetchurl {
url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz";
sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r";
};
buildInputs = [ ncurses ];
configurePhase = ''
./configure --prefix=$out/usr --sysconfdir=$out/etc \
--localstatedir=$out/var --sbindir=$out/bin
'';
meta = {
description = "A console-based network monitoring utility (fork of iptraf)";
longDescription = ''
IPTraf-ng is a console-based network monitoring utility. IPTraf-ng
gathers data like TCP connection packet and byte counts, interface
statistics and activity indicators, TCP/UDP traffic breakdowns, and LAN
station packet and byte counts. IPTraf-ng features include an IP traffic
monitor which shows TCP flag information, packet and byte counts, ICMP
details, OSPF packet types, and oversized IP packet warnings; interface
statistics showing IP, TCP, UDP, ICMP, non-IP and other IP packet counts,
IP checksum errors, interface activity and packet size counts; a TCP and
UDP service monitor showing counts of incoming and outgoing packets for
common TCP and UDP application ports, a LAN statistics module that
discovers active hosts and displays statistics about their activity; TCP,
UDP and other protocol display filters so you can view just the traffic
you want; logging; support for Ethernet, FDDI, ISDN, SLIP, PPP, and
loopback interfaces; and utilization of the built-in raw socket interface
of the Linux kernel, so it can be used on a wide variety of supported
network cards.
'';
homepage = https://fedorahosted.org/iptraf-ng/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.devhell ];
};
}

30
pkgs/applications/version-management/git-and-tools/git-hub/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, docutils, python }:
let version = "0.9.0"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "git-hub-${version}";
src = fetchFromGitHub {
@ -11,6 +11,20 @@ stdenv.mkDerivation rec {
owner = "sociomantic";
};
meta = with stdenv.lib; {
inherit version;
description = "Git command line interface to GitHub";
longDescription = ''
A simple command line interface to GitHub, enabling most useful GitHub
tasks (like creating and listing pull request or issues) to be accessed
directly through the Git command line.
'';
homepage = https://github.com/sociomantic/git-hub;
license = licenses.gpl3Plus;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ python ];
nativeBuildInputs = [ docutils ];
@ -27,18 +41,4 @@ stdenv.mkDerivation rec {
# Remove inert ftdetect vim plugin and a README that's a man page subset:
rm -r $out/share/{doc,vim}
'';
meta = with stdenv.lib; {
inherit version;
inherit (src.meta) homepage;
description = "Git command line interface to GitHub";
longDescription = ''
A simple command line interface to GitHub, enabling most useful GitHub
tasks (like creating and listing pull request or issues) to be accessed
directly through the Git command line.
'';
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

16
pkgs/applications/version-management/subversion/default.nix
View file

@ -8,7 +8,6 @@
, stdenv, fetchurl, apr, aprutil, zlib, sqlite
, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
, sasl ? null, serf ? null
, branch ? "1.9"
}:
assert bdbSupport -> aprutil.bdbSupport;
@ -16,26 +15,15 @@ assert httpServer -> apacheHttpd != null;
assert pythonBindings -> swig != null && python != null;
assert javahlBindings -> jdk != null && perl != null;
let
config = {
"1.9".ver_min = "2";
"1.9".sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017";
"1.8".ver_min = "14";
"1.8".sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497";
};
in
assert builtins.hasAttr branch config;
stdenv.mkDerivation (rec {
version = "${branch}." + config.${branch}.ver_min;
version = "1.9.2";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion/${name}.tar.bz2";
inherit (config.${branch}) sha1;
sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017";
};
buildInputs = [ zlib apr aprutil sqlite ]

8
pkgs/applications/video/smplayer/default.nix
View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, qt5 }:
{ stdenv, fetchurl, qt4 }:
stdenv.mkDerivation rec {
name = "smplayer-15.9.0";
name = "smplayer-14.9.0.6690";
src = fetchurl {
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
sha256 = "1yx6kikaj9v5aj8aavvrcklx283wl6wrnpl905hjc7v03kgp1ac5";
sha256 = "0nmw69kg8rqvl9icyx1r1v1pyxg6560363l0kyqyja18j79a3j2y";
};
patches = [ ./basegui.cpp.patch ];
buildInputs = [ qt5.script ];
buildInputs = [ qt4 ];
preConfigure = ''
makeFlags="PREFIX=$out"

7
pkgs/build-support/build-fhs-chrootenv/env.nix
View file

@ -182,12 +182,6 @@ let
setupLibDirs = if isTargetBuild then setupLibDirs_target
else setupLibDirs_multi;
setupIncludeDir = ''
if [ -x "${staticUsrProfileTarget}/include" ]
then
ln -s "${staticUsrProfileTarget}/include"
fi
'';
# the target profile is the actual profile that will be used for the chroot
setupTargetProfile = ''
@ -198,7 +192,6 @@ let
cd usr
${linkProfile staticUsrProfileTarget}
${setupLibDirs}
${setupIncludeDir}
cd ..
rm -rf usr/etc usr/var
'';

9
pkgs/data/fonts/symbola/default.nix
View file

@ -5,7 +5,11 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://users.teilar.gr/~g1951d/Symbola.zip";
sha256 = "1lfs2j816332ysvpb5ibj2gwpmyqyispqdl7skkshf2gra18hmhd";
sha256 = "07bczpl3vqdpg2gakfddhzzgpb6v2wpasv7rwqxkyg9yd9lmbr0s";
};
docs_pdf = fetchurl {
url = "http://users.teilar.gr/~g1951d/Symbola.pdf";
sha256 = "1zmq1ijl0k5hrc6vpa2xp9n1x2zrrd7ng3jwc9yf0qsi3pmkpk0p";
};
buildInputs = [ unzip ];
@ -20,7 +24,8 @@ stdenv.mkDerivation rec {
mkdir -p "$out/doc/${name}"
cp -v Symbola.docx "$out/doc/${name}/"
cp -v Symbola.pdf "$out/doc/${name}/"
cp -v Symbola.htm "$out/doc/${name}/"
cp -v "$docs_pdf" "$out/doc/${name}/${docs_pdf.name}"
'';
meta = {

7
pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
View file

@ -20,7 +20,7 @@
{ lib, fetchurl, writeScript, ruby, libxml2, libxslt, python, stdenv, which
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin
, cmake, libssh2, openssl, mysql
}:
let
@ -70,7 +70,6 @@ in
"--with-exslt-lib=${libxslt}/lib"
"--with-exslt-include=${libxslt}/include"
] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
};
pg = attrs: {
@ -120,10 +119,6 @@ in
'';
};
unf_ext = attrs: {
buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
};
xapian-ruby = attrs: {
# use the system xapian
buildInputs = [ xapian pkgconfig zlib ];

4
pkgs/development/libraries/glpk/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "glpk-4.56";
name = "glpk-4.52.1";
src = fetchurl {
url = "mirror://gnu/glpk/${name}.tar.gz";
sha256 = "0syzix6qvpn0fzp08c84c8snansf1cam5vd0dk2w91mz2c85d18h";
sha256 = "0nz9ngmx23c8gbjr8l8ygnfaanxj2mwbl8awpg630bgrkxdnhc9j";
};
doCheck = true;

4
pkgs/development/libraries/libdnet/default.nix
View file

@ -10,9 +10,9 @@ stdenv.mkDerivation {
sha1 = "71302be302e84fc19b559e811951b5d600d976f8";
};
buildInputs = [ automake autoconf libtool ];
configureFlags = [ "--enable-shared" ]; # shared libs required by hyenae
CFLAGS="-fPIC";
buildInputs = [ automake autoconf libtool ];
# .so endings are missing (quick and dirty fix)
postInstall = ''

17
pkgs/development/libraries/libunwind/native.nix Normal file
View file

@ -0,0 +1,17 @@
{ stdenv }:
assert stdenv.isDarwin;
stdenv.mkDerivation {
name = "libunwind-native";
unpackPhase = ":";
dontBuild = true;
installPhase = ''
mkdir -p $out/lib
cat /usr/lib/system/libunwind.dylib > $out/lib/libunwind.dylib
'';
meta.platforms = stdenv.lib.platforms.darwin;
}

24
pkgs/development/libraries/ncurses/default.nix
View file

@ -1,37 +1,38 @@
{ lib, stdenv, fetchurl, pkgconfig, libtool
{ lib, stdenv, fetchurl
, mouseSupport ? false
, unicode ? true
, gpm
# Extra Options
, abiVersion ? "5"
}:
stdenv.mkDerivation rec {
name = "ncurses-6.0";
name = "ncurses-5.9";
src = fetchurl {
url = "mirror://gnu/ncurses/${name}.tar.gz";
sha256 = "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm";
sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
};
# gcc-5.patch should be removed after 5.9
patches = [ ./gcc-5.patch ];
configureFlags = [
"--with-shared"
"--with-cxx-shared"
"--with-libtool"
"--without-debug"
"--enable-overwrite" # Needed for proper header installation
"--enable-pc-files"
"--enable-symlinks"
] ++ lib.optional unicode "--enable-widec";
nativeBuildInputs = [ pkgconfig libtool ];
buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
preConfigure = ''
configureFlagsArray+=("--includedir=$out/include")
export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
mkdir -p "$PKG_CONFIG_LIBDIR"
configureFlagsArray+=("--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR")
'' + lib.optionalString stdenv.isCygwin ''
sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
'';
@ -68,6 +69,7 @@ stdenv.mkDerivation rec {
for dylibtype in so dll dylib; do
if [ -e "$out/lib/lib''${lib}$suffix.$dylibtype" ]; then
ln -svf lib''${lib}$suffix.$dylibtype $out/lib/lib$lib$newsuffix.$dylibtype
ln -svf lib''${lib}$suffix.$dylibtype.${abiVersion} $out/lib/lib$lib$newsuffix.$dylibtype.${abiVersion}
fi
done
for statictype in a dll.a la; do
@ -80,6 +82,10 @@ stdenv.mkDerivation rec {
done
'';
preFixup = ''
rm $out/lib/*.a
'';
meta = {
description = "Free software emulation of curses in SVR4 and more";
@ -106,6 +112,6 @@ stdenv.mkDerivation rec {
passthru = {
ldflags = "-lncurses";
inherit unicode;
inherit unicode abiVersion;
};
}

46
pkgs/development/libraries/ncurses/gcc-5.patch Normal file
View file

@ -0,0 +1,46 @@
https://bugs.gentoo.org/545114
extracted from the upstream change (which had many unrelated commits in one)
From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
From: "Thomas E. Dickey" <dickey@invisible-island.net>
Date: Sun, 7 Dec 2014 03:10:09 +0000
Subject: [PATCH] ncurses 5.9 - patch 20141206
+ modify MKlib_gen.sh to work around change in development version of
gcc introduced here:
https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
(reports by Marcus Shawcroft, Maohui Lei).
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index d8cc3c9..b91398c 100755
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -474,11 +474,22 @@ sed -n -f $ED1 \
-e 's/gen_$//' \
-e 's/ / /g' >>$TMP
+cat >$ED1 <<EOF
+s/ / /g
+s/^ //
+s/ $//
+s/P_NCURSES_BOOL/NCURSES_BOOL/g
+EOF
+
+# A patch discussed here:
+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+# introduces spurious #line markers. Work around that by ignoring the system's
+# attempt to define "bool" and using our own symbol here.
+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
+cat $ED2 >$TMP
+
$preprocessor $TMP 2>/dev/null \
-| sed \
- -e 's/ / /g' \
- -e 's/^ //' \
- -e 's/_Bool/NCURSES_BOOL/g' \
+| sed -f $ED1 \
| $AWK -f $AW2 \
| sed -f $ED3 \
| sed \

5
pkgs/development/libraries/neon/default.nix
View file

@ -14,12 +14,11 @@ let
in
stdenv.mkDerivation rec {
version = "0.30.1";
name = "neon-${version}";
name = "neon-0.29.6";
src = fetchurl {
url = "http://www.webdav.org/neon/${name}.tar.gz";
sha256 = "1pawhk02x728xn396a1kcivy9gqm94srmgad6ymr9l0qvk02dih0";
sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w";
};
patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];

84
pkgs/development/libraries/openssl/1.0.2.x.nix Normal file
View file

@ -0,0 +1,84 @@
{ stdenv, fetchurl, perl
, withCryptodev ? false, cryptodevHeaders }:
with stdenv.lib;
let
opensslCrossSystem = attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null)
stdenv.cross;
in
stdenv.mkDerivation rec {
name = "openssl-1.0.2d";
src = fetchurl {
urls = [
"http://www.openssl.org/source/${name}.tar.gz"
"http://openssl.linux-mirror.org/source/${name}.tar.gz"
];
sha1 = "d01d17b44663e8ffa6a33a5a30053779d9593c3d";
};
patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
# On x86_64-darwin, "./config" misdetects the system as
# "darwin-i386-cc". So specify the system type explicitly.
configureScript =
if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc"
else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
else "./config";
configureFlags = [
"shared"
"--libdir=lib"
"--openssldir=etc/ssl"
] ++ stdenv.lib.optionals withCryptodev [
"-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS"
];
makeFlags = [
"MANDIR=$(out)/share/man"
];
# Parallel building is broken in OpenSSL.
enableParallelBuilding = false;
postInstall = ''
# If we're building dynamic libraries, then don't install static
# libraries.
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
rm "$out/lib/"*.a
fi
# remove dependency on Perl at runtime
rm -r $out/etc/ssl/misc $out/bin/c_rehash
'';
postFixup = ''
# Check to make sure we don't depend on perl
if grep -r '${perl}' $out; then
echo "Found an erroneous dependency on perl ^^^" >&2
exit 1
fi
'';
crossAttrs = {
preConfigure=''
# It's configure does not like --build or --host
export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
'';
configureScript = "./Configure";
};
meta = {
homepage = http://www.openssl.org/;
description = "A cryptographic library that implements the SSL and TLS protocols";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ];
priority = 10; # resolves collision with ‘man-pages’
};
}

4
pkgs/development/libraries/openssl/default.nix
View file

@ -8,14 +8,14 @@ let
stdenv.cross;
in
stdenv.mkDerivation rec {
name = "openssl-1.0.2d";
name = "openssl-1.0.1p";
src = fetchurl {
urls = [
"http://www.openssl.org/source/${name}.tar.gz"
"http://openssl.linux-mirror.org/source/${name}.tar.gz"
];
sha256 = "671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8";
sha1 = "9d1977cc89242cd11471269ece2ed4650947c046";
};
outputs = [ "out" "man" ];

36
pkgs/development/web/iojs/default.nix
View file

@ -1,36 +0,0 @@
{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv }:
let
version = "3.1.0";
inherit (stdenv.lib) optional maintainers licenses platforms;
in stdenv.mkDerivation {
name = "iojs-${version}";
src = fetchurl {
url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
sha256 = "15qh5pscg3588hyf4yfhma34gjkg87v5i4xzxj804g6m52m6y727";
};
prePatch = ''
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
'';
configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ];
# iojs has --enable-static but no --disable-static. Automatically adding --disable-static
# causes configure to fail, so don't add --disable-static.
dontDisableStatic = true;
buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
setupHook = ../nodejs/setup-hook.sh;
passthru.interpreterName = "iojs";
meta = {
description = "A friendly fork of Node.js with an open governance model";
homepage = https://iojs.org/;
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.havvy ];
};
}

24
pkgs/development/web/nodejs/default-arch.patch
View file

@ -1,24 +0,0 @@
diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
--- a/tools/gyp/pylib/gyp/xcode_emulation.py 2014-01-23 06:05:51.000000000 +0100
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py 2014-02-04 17:49:48.000000000 +0100
@@ -1018,12 +1033,16 @@
# Since the value returned by this function is only used when ARCHS is not
# set, then on iOS we return "i386", as the default xcode project generator
# does not set ARCHS if it is not set in the .gyp file.
- if self.isIOS:
+
+ try:
+ if self.isIOS:
+ return 'i386'
+ version, build = self._XcodeVersion()
+ if version >= '0500':
+ return 'x86_64'
return 'i386'
- version, build = self._XcodeVersion()
- if version >= '0500':
+ except:
return 'x86_64'
- return 'i386'
class MacPrefixHeader(object):
"""A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.

7
pkgs/development/web/nodejs/default.nix
View file

@ -38,13 +38,12 @@ in stdenv.mkDerivation {
dontDisableStatic = true;
prePatch = ''
patchShebangs .
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
'';
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ];
patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch;
buildInputs = [ python which zlib libuv openssl python ]
++ optionals stdenv.isLinux [ utillinux http-parser ]
buildInputs = [ python which http-parser zlib libuv openssl python ]
++ (optional stdenv.isLinux utillinux)
++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
setupHook = ./setup-hook.sh;

21
pkgs/development/web/nodejs/no-xcode.patch
View file

@ -70,3 +70,24 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_
def AdjustLibraries(self, libraries, config_name=None):
"""Transforms entries like 'Cocoa.framework' in libraries into entries like
@@ -1018,12 +1033,16 @@
# Since the value returned by this function is only used when ARCHS is not
# set, then on iOS we return "i386", as the default xcode project generator
# does not set ARCHS if it is not set in the .gyp file.
- if self.isIOS:
+
+ try:
+ if self.isIOS:
+ return 'i386'
+ version, build = self._XcodeVersion()
+ if version >= '0500':
+ return 'x86_64'
return 'i386'
- version, build = self._XcodeVersion()
- if version >= '0500':
+ except:
return 'x86_64'
- return 'i386'
class MacPrefixHeader(object):
"""A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.

13
pkgs/development/web/nodejs/pkg-libpath.patch
View file

@ -1,13 +0,0 @@
diff --git a/configure b/configure
index d199975..66d903b 100755
--- a/configure
+++ b/configure
@@ -734,7 +734,7 @@ def configure_library(lib, output):
# libpath needs to be provided ahead libraries
if pkg_libpath:
output['libraries'] += (
- filter(None, map(str.strip, pkg_cflags.split('-L'))))
+ pkg_libpath.split())
default_libs = getattr(options, shared_lib + '_libname')
default_libs = map('-l{0}'.format, default_libs.split(','))

2
pkgs/development/web/nodejs/v0_10.nix
View file

@ -42,7 +42,7 @@ in stdenv.mkDerivation {
patchShebangs .
'';
patches = stdenv.lib.optionals stdenv.isDarwin [ ./default-arch.patch ./no-xcode.patch ];
patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch;
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
(cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})

3
pkgs/misc/jackaudio/jack1.nix
View file

@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ optAlsaLib optDb optLibffado optCelt ];
propagatedBuildInputs = [ optLibuuid ];
buildInputs = [ optAlsaLib optDb optLibuuid optLibffado optCelt ];
meta = with stdenv.lib; {
description = "JACK audio connection kit";

42
pkgs/misc/urbit/default.nix
View file

@ -1,42 +0,0 @@
{ stdenv, fetchgit, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel,
cmake, re2c, libtool, ncurses, perl, zlib, python }:
stdenv.mkDerivation rec {
name = "urbit-${version}";
version = "2015.09.26";
src = fetchgit {
url = "https://github.com/urbit/urbit.git";
rev = "c9592664c797b2dd74f26886528656f8a7058640";
sha256 = "0sgrxnmpqh54mgar81wlb6gff8c0pc24p53xwxr448g5shvnzjx9";
};
buildInputs = with stdenv.lib; [
gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool
ncurses perl zlib python
];
configurePhase = ''
:
'';
buildPhase = ''
sed -i 's/-lcurses/-lncurses/' Makefile
mkdir -p $out
cp -r . $out/
cd $out
make
'';
installPhase = ''
:
'';
meta = with stdenv.lib; {
description = "an operating function";
homepage = http://urbit.org/preview/~2015.9.25/materials;
license = licenses.mit;
maintainers = with maintainers; [ mudri ];
};
}

4
pkgs/os-specific/linux/kernel/linux-3.14.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "3.14.54";
version = "3.14.53";
# Remember to update grsecurity!
extraMeta.branch = "3.14";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0jjl7xx2mkkhy3yg3mza2h7ysz48qcn0z475jldfw4fh87ajlfig";
sha256 = "0zqaqa7gs895p521c82jggak9zlmiwmkfarh2ykvh423sxjbvs5i";
};
features.iwlwifi = true;

26
pkgs/os-specific/linux/miraclecast/default.nix
View file

@ -1,26 +0,0 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, systemd, glib, readline }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "miraclecast-0.0-git-20151002";
src = fetchFromGitHub {
owner = "albfan";
repo = "miraclecast";
rev = "30b8c2d22391423f76ba582aaaa1e0936869103a";
sha256 = "0i076n76kq64fayc7v06gr1853pk5r6ms86m57vd1xsjd0r9wyxd";
};
# INFO: It is important to list 'systemd' first as for now miraclecast
# links against a customized systemd. Otherwise, a systemd package from
# a propagatedBuildInput could take precedence.
buildInputs = [ systemd autoreconfHook pkgconfig udev glib readline ];
meta = {
homepage = https://github.com/albfan/miraclecast;
description = "Connect external monitors via Wi-Fi";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ tstrobel ];
platforms = platforms.linux;
};
}

2
pkgs/os-specific/linux/nvidiabl/default.nix
View file

@ -8,8 +8,6 @@ stdenv.mkDerivation {
sha256 = "1c7ar39wc8jpqh67sw03lwnyp0m9l6dad469ybqrgcywdiwxspwj";
};
patches = [ ./linux4compat.patch ];
preConfigure = ''
sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile
'';

22
pkgs/os-specific/linux/nvidiabl/linux4compat.patch
View file

@ -1,22 +0,0 @@
From 2bf6f08b2492cc04a2c39fdcb22a2d0c18963d1c Mon Sep 17 00:00:00 2001
From: sonic414 <sonic414@gmail.com>
Date: Tue, 28 Apr 2015 19:30:15 +0530
Subject: [PATCH] strnicmp to strncasecmp in Linux 4.0.0
---
nvidiabl-module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nvidiabl-module.c b/nvidiabl-module.c
index b789ea4..b306579 100644
--- a/nvidiabl-module.c
+++ b/nvidiabl-module.c
@@ -214,7 +214,7 @@ static int __init nvidiabl_init(void)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) {
- if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
+ if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
props.type = backlight_type_ids[iii].type;
printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id);
}

3
pkgs/os-specific/linux/syslinux/default.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "03l5iifwlg1wyb4yh98i0b7pd4j55a1c9y74q1frs47a5dnrilr6";
};
patches = [ ./perl-deps.patch ];
# gcc5-fix should be in 6.04+, so remove if it fails to apply.
patches = [ ./perl-deps.patch ./gcc5-fix.patch ];
buildInputs = [ nasm perl libuuid ];

26
pkgs/os-specific/linux/syslinux/gcc5-fix.patch Normal file
View file

@ -0,0 +1,26 @@
diff --git a/com32/include/menu.h b/com32/include/menu.h
index bc0182f..b0251e4 100644
--- a/com32/include/menu.h
+++ b/com32/include/menu.h
@@ -195,7 +195,7 @@ void local_cursor_enable(bool);
static inline int my_isspace(char c)
{
- return (unsigned char)c <= ' ';
+ return (unsigned char)c <= ' ' || (unsigned char)c == '\x7f';
}
int my_isxdigit(char c);
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index b7814be..a433fad 100644
--- a/com32/menu/readconfig.c
+++ b/com32/menu/readconfig.c
@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
char c;
while ((c = *src++)) {
- if (c <= ' ' && c == '\x7f') {
+ if (my_isspace(c)) {
if (!was_space)
*dst++ = '_';
was_space = true;

3
pkgs/os-specific/linux/systemd/default.nix
View file

@ -3,7 +3,6 @@
, glib, kbd, libxslt, coreutils, libgcrypt
, kexectools, libmicrohttpd, linuxHeaders
, pythonPackages ? null, pythonSupport ? false
, enableKDbus ? false
}:
assert stdenv.isLinux;
@ -61,7 +60,7 @@ stdenv.mkDerivation rec {
"--with-sysvinit-path="
"--with-sysvrcnd-path="
"--with-rc-local-script-path-stop=/etc/halt.local"
] ++ stdenv.lib.optional enableKDbus "--enable-kdbus";
];
preConfigure =
''

7
pkgs/servers/mail/opensmtpd/default.nix
View file

@ -4,18 +4,16 @@
stdenv.mkDerivation rec {
name = "opensmtpd-${version}";
version = "5.7.1p1";
version = "5.4.5p1";
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ libasr libevent zlib openssl db pam ];
src = fetchurl {
url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
sha256 = "67e9dd9682ca8c181e84e66c76245a4a8f6205834f915a2c021cdfeb22049e3a";
sha256 = "15sicrpqsgg72igdckkwpmbgrapcjbfjsdrvm0zl8z13kgp6r4ks";
};
patches = [ ./proc_path.diff ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
@ -26,7 +24,6 @@ stdenv.mkDerivation rec {
"--with-privsep-user=smtpd"
"--with-queue-user=smtpq"
"--with-ca-file=/etc/ssl/certs/ca-certificates.crt"
"--with-libevent-dir=${libevent}"
];
installFlags = [

79
pkgs/servers/mail/opensmtpd/extras.nix
View file

@ -1,79 +0,0 @@
{ stdenv, fetchurl, openssl, libevent, libasr,
python2, pkgconfig, lua5, perl, mariadb, postgresql, sqlite, hiredis }:
stdenv.mkDerivation rec {
name = "opensmtpd-extras-${version}";
version = "5.7.1";
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
sha256 = "1kld4hxgz792s0cb2gl7m2n618ikzqkj88w5dhaxdrxg4x2c4vdm";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl libevent
libasr python2 lua5 perl mariadb postgresql sqlite hiredis ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-privsep-user=smtpd"
"--with-libevent-dir=${libevent}"
"--with-filter-clamav"
"--with-filter-dkim-signer"
"--with-filter-dnsbl"
"--with-filter-monkey"
"--with-filter-pause"
"--with-filter-regex"
"--with-filter-spamassassin"
"--with-filter-stub"
"--with-filter-trace"
"--with-filter-void"
"--with-queue-null"
"--with-queue-ram"
"--with-queue-stub"
"--with-table-ldap"
"--with-table-socketmap"
"--with-table-passwd"
"--with-table-stub"
"--with-scheduler-ram"
"--with-scheduler-stub"
] ++ stdenv.lib.optional (python2 != null) [
"--with-python=${python2}"
"--with-filter-python"
"--with-queue-python"
"--with-table-python"
"--with-scheduler-python"
] ++ stdenv.lib.optional (lua5 != null) [
"--with-lua=${pkgconfig}"
"--with-filter-lua"
] ++ stdenv.lib.optional (perl != null) [
"--with-perl=${perl}"
"--with-filter-perl"
] ++ stdenv.lib.optional (mariadb != null) [
"--with-table-mysql"
] ++ stdenv.lib.optional (postgresql != null) [
"--with-table-postgres"
] ++ stdenv.lib.optional (sqlite != null) [
"--with-table-sqlite"
] ++ stdenv.lib.optional (hiredis != null) [
"--with-table-redis"
];
NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) [ "-I${hiredis}/include/hiredis" ];
meta = with stdenv.lib; {
homepage = https://www.opensmtpd.org/;
description = "Extra plugins for the OpenSMTPD mail server";
license = licenses.isc;
platforms = platforms.unix;
maintainers = with maintainers; [ gebner ];
};
}

76
pkgs/servers/mail/opensmtpd/proc_path.diff
View file

@ -1,76 +0,0 @@
diff -Naur opensmtpd-5.7.1p1/smtpd/parse.y opensmtpd-5.7.1p1.patched/smtpd/parse.y
--- opensmtpd-5.7.1p1/smtpd/parse.y 2015-06-30 10:13:34.000000000 +0200
+++ opensmtpd-5.7.1p1.patched/smtpd/parse.y 2015-09-26 08:41:17.012472516 +0200
@@ -2519,13 +2519,19 @@
{
struct filter_conf *f;
char *path;
+ const char *proc_path;
if (dict_get(&conf->sc_filters, name)) {
yyerror("filter \"%s\" already defined", name);
return (NULL);
}
- if (asprintf(&path, "%s/filter-%s", PATH_LIBEXEC, prog) == -1) {
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
+ if (proc_path == NULL) {
+ proc_path = PATH_LIBEXEC;
+ }
+
+ if (asprintf(&path, "%s/filter-%s", proc_path, prog) == -1) {
yyerror("filter \"%s\" asprintf failed", name);
return (0);
}
diff -Naur opensmtpd-5.7.1p1/smtpd/smtpd.c opensmtpd-5.7.1p1.patched/smtpd/smtpd.c
--- opensmtpd-5.7.1p1/smtpd/smtpd.c 2015-06-30 10:13:34.000000000 +0200
+++ opensmtpd-5.7.1p1.patched/smtpd/smtpd.c 2015-09-26 08:41:16.998472557 +0200
@@ -854,6 +854,7 @@
char path[PATH_MAX];
char name[PATH_MAX];
char *arg;
+ char *proc_path;
if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) {
log_warnx("warn: %s-proc: conf too long", key);
@@ -864,7 +865,12 @@
if (arg)
*arg++ = '\0';
- if (snprintf(path, sizeof(path), PATH_LIBEXEC "/%s-%s", key, name) >=
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
+ if (proc_path == NULL) {
+ proc_path = PATH_LIBEXEC;
+ }
+
+ if (snprintf(path, sizeof(path), "%s/%s-%s", proc_path, key, name) >=
(ssize_t)sizeof(path)) {
log_warn("warn: %s-proc: exec path too long", key);
return (-1);
diff -Naur opensmtpd-5.7.1p1/smtpd/table.c opensmtpd-5.7.1p1.patched/smtpd/table.c
--- opensmtpd-5.7.1p1/smtpd/table.c 2015-06-30 10:13:34.000000000 +0200
+++ opensmtpd-5.7.1p1.patched/smtpd/table.c 2015-09-26 08:41:17.005472536 +0200
@@ -201,6 +201,7 @@
struct table_backend *tb;
char buf[LINE_MAX];
char path[LINE_MAX];
+ const char *proc_path;
size_t n;
struct stat sb;
@@ -215,8 +216,14 @@
if (name && table_find(name, NULL))
fatalx("table_create: table \"%s\" already defined", name);
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
+ if (proc_path == NULL) {
+ proc_path = PATH_LIBEXEC;
+ }
+
if ((tb = table_backend_lookup(backend)) == NULL) {
- if ((size_t)snprintf(path, sizeof(path), PATH_LIBEXEC "/table-%s",
+ if ((size_t)snprintf(path, sizeof(path), "%s/table-%s",
+ proc_path,
backend) >= sizeof(path)) {
fatalx("table_create: path too long \""
PATH_LIBEXEC "/table-%s\"", backend);

9
pkgs/stdenv/linux/default.nix
View file

@ -210,9 +210,14 @@ rec {
gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
isl_0_14 = pkgs.isl_0_14.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
isl_0_11 = pkgs.isl_0_11.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
cloog_0_18_0 = pkgs.cloog_0_18_0.override {
stdenv = pkgs.makeStaticLibraries pkgs.stdenv;
isl = isl_0_11;
};
gccPlain = pkgs.gcc.cc.override {
isl = isl_0_14;
isl = isl_0_11;
cloog = cloog_0_18_0;
};
};
extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];

19
pkgs/tools/filesystems/duff/default.nix
View file

@ -1,14 +1,12 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gettext }:
# The last release (0.5.2) is more than 2 years old and lacks features like -D,
# limiting its usefulness. Upstream appears comatose if not dead.
let version = "2014-07-03"; in
let version = "0.5.2"; in
stdenv.mkDerivation {
name = "duff-${version}";
src = fetchFromGitHub {
sha256 = "1k2dx38pjzc5d624vw1cs5ipj9fprsm5vqv55agksc29m63lswnx";
rev = "f26d4837768b062a3f98fa075c791d9c8a0bb75c";
sha256 = "0yfm910wjj6z0f0cg68x59ykf4ql5m49apzy8sra00f8kv4lpn53";
rev = version;
repo = "duff";
owner = "elmindreda";
};
@ -16,6 +14,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook gettext ];
preAutoreconf = ''
# duff is currently badly packaged, requiring us to do extra work here that
# should be done upstream. If that is ever fixed, this entire phase can be
# removed along with all buildInputs.
# gettexttize rightly refuses to run non-interactively:
cp ${gettext}/bin/gettextize .
substituteInPlace gettextize \
@ -28,15 +30,14 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
meta = with stdenv.lib; {
inherit version;
description = "Quickly find duplicate files";
homepage = http://duff.dreda.org/;
license = licenses.zlib;
longDescription = ''
Duff is a Unix command-line utility for quickly finding duplicates in
a given set of files.
'';
homepage = http://duff.dreda.org/;
license = licenses.zlib;
platforms = platforms.all;
maintainers = with maintainers; [ nckx ];
platforms = with platforms; all;
};
}

10
pkgs/tools/graphics/enblend-enfuse/default.nix
View file

@ -1,24 +1,22 @@
{ stdenv, fetchurl
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra
, help2man, pkgconfig, perl }:
, pkgconfig, perl }:
let version = "4.1.4"; in
stdenv.mkDerivation rec {
name = "enblend-enfuse-${version}";
name = "enblend-enfuse-4.1.3";
src = fetchurl {
url = "mirror://sourceforge/enblend/${name}.tar.gz";
sha256 = "0208x01i129hqylmy6jh3krwdac47mx6fi8xccjm9h35c18c7xl5";
sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w";
};
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ];
nativeBuildInputs = [ help2man perl pkgconfig ];
nativeBuildInputs = [ perl pkgconfig ];
enableParallelBuilding = true;
meta = {
inherit version;
homepage = http://enblend.sourceforge.net/;
description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";
license = stdenv.lib.licenses.gpl2;

28
pkgs/tools/misc/heatseeker/default.nix
View file

@ -1,28 +0,0 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
with rustPlatform;
buildRustPackage rec {
name = "heatseeker-${version}";
version = "1.3.0";
depsSha256 = "03jap7myf85xgx9270sws8x57nl04a1wx8szrk9qx24s9vnnjcnh";
src = fetchFromGitHub {
owner = "rschmitt";
repo = "heatseeker";
rev = "v${version}";
sha256 = "1xdvwgmh9lwv82hv1qg82bjv2iplnvva6lzbg7dyhbszhv7rhkbl";
};
# some tests require a tty, this variable turns them off for Travis CI,
# which we can also make use of
TRAVIS= "true";
meta = with stdenv.lib; {
description = "A general-purpose fuzzy selector";
homepage = https://github.com/rschmitt/heatseeker;
license = stdenv.lib.licenses.mit;
maintainers = [ maintainers.michaelpj ];
};
}

6
pkgs/tools/networking/openssh/default.nix
View file

@ -17,11 +17,11 @@ let
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "openssh-7.1p1";
name = "openssh-6.9p1";
src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
sha256 = "0a44mnr8bvw41zg83xh4sb55d8nds29j95gxvxk5qg863lnns2pw";
sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf";
};
prePatch = optionalString hpnSupport
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
'';
patches = [ ./locale_archive.patch ];
patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch];
buildInputs = [ zlib openssl libedit pkgconfig pam ]
++ optional withKerberos [ kerberos ];

65
pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch Normal file
View file

@ -0,0 +1,65 @@
http://pkgs.fedoraproject.org/cgit/openssh.git/commit/openssh-6.9p1-security-7.0.patch?h=f22&id=4776fad91e7e1f626f33e8c240d0ccecd663554d
diff --git a/sshpty.c b/sshpty.c
index 7bb7641..15da8c6 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */
+/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -197,7 +197,7 @@ pty_setowner(struct passwd *pw, const char *tty)
/* Determine the group to make the owner of the tty. */
grp = getgrnam("tty");
gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid;
- mode = (grp != NULL) ? 0622 : 0600;
+ mode = (grp != NULL) ? 0620 : 0600;
/*
* Change owner and mode of the tty as required.
diff --git a/monitor.c b/monitor.c
index b410965..f1b873d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device;
int
mm_answer_pam_init_ctx(int sock, Buffer *m)
{
-
debug3("%s", __func__);
- authctxt->user = buffer_get_string(m, NULL);
sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
sshpam_authok = NULL;
buffer_clear(m);
@@ -1166,14 +1166,16 @@ mm_answer_pam_respond(int sock, Buffer *m)
int
mm_answer_pam_free_ctx(int sock, Buffer *m)
{
+ int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt;
debug3("%s", __func__);
(sshpam_device.free_ctx)(sshpam_ctxt);
+ sshpam_ctxt = sshpam_authok = NULL;
buffer_clear(m);
mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
auth_method = "keyboard-interactive";
auth_submethod = "pam";
- return (sshpam_authok == sshpam_ctxt);
+ return r;
}
#endif
diff --git a/monitor_wrap.c b/monitor_wrap.c
index e6217b3..eac421b 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -614,7 +614,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt)
debug3("%s", __func__);
buffer_init(&m);
- buffer_put_cstring(&m, authctxt->user);
mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m);
debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__);
mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m);

48
pkgs/top-level/all-packages.nix
View file

@ -853,8 +853,6 @@ let
gmic = callPackage ../tools/graphics/gmic { };
heatseeker = callPackage ../tools/misc/heatseeker { };
mathics = pythonPackages.mathics;
mcrl = callPackage ../tools/misc/mcrl { };
@ -1370,7 +1368,7 @@ let
emv = callPackage ../tools/misc/emv { };
enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { };
enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { };
encfs = callPackage ../tools/filesystems/encfs { };
@ -3734,7 +3732,7 @@ let
gambit = callPackage ../development/compilers/gambit { };
gcc = gcc5;
gcc = gcc49;
gcc_multi =
if system == "x86_64-linux" then lowPrio (
@ -4986,7 +4984,8 @@ let
fetchurl = fetchurlBoot;
};
perl = perl522;
# Make perl522 the default once gnulib is updated to support it.
perl = perl520;
php = php56;
@ -5842,7 +5841,7 @@ let
aalib = callPackage ../development/libraries/aalib { };
accelio = callPackage ../development/libraries/accelio { };
accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; };
accountsservice = callPackage ../development/libraries/accountsservice { };
@ -6350,8 +6349,7 @@ let
gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions
gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { };
gmp6 = callPackage ../development/libraries/gmp/6.x.nix { };
gmp = gmp6;
gmp = gmp5;
gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
#GMP ex-satellite, so better keep it near gmp
@ -7405,9 +7403,11 @@ let
libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
libunwind = if stdenv.isDarwin
then darwin.libunwind
then libunwindNative
else callPackage ../development/libraries/libunwind { };
libunwindNative = callPackage ../development/libraries/libunwind/native.nix {};
libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv {
automake = automake113x; # fails with 14
inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
@ -7781,6 +7781,14 @@ let
};
};
openssl_1_0_2 = callPackage ../development/libraries/openssl/1.0.2.x.nix {
fetchurl = fetchurlBoot;
cryptodevHeaders = linuxPackages.cryptodev.override {
fetchurl = fetchurlBoot;
onlyHeaders = true;
};
};
openwsman = callPackage ../development/libraries/openwsman {};
ortp = callPackage ../development/libraries/ortp { };
@ -9068,7 +9076,6 @@ let
openresty = callPackage ../servers/http/openresty { };
opensmtpd = callPackage ../servers/mail/opensmtpd { };
opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
openxpki = callPackage ../servers/openxpki { };
@ -10014,10 +10021,6 @@ let
mingetty = callPackage ../os-specific/linux/mingetty { };
miraclecast = callPackage ../os-specific/linux/miraclecast {
systemd = systemd.override { enableKDbus = true; };
};
module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
aggregateModules = modules:
@ -10173,13 +10176,7 @@ let
sysklogd = callPackage ../os-specific/linux/sysklogd { };
syslinux = callPackage ../os-specific/linux/syslinux {
# Using GCC5 with 6.03 creates a broken isolinux.bin
# Make sure to test booting the livecd on a bios system
# if changing this override.
# nixos.tests.bootBiosCdrom is useful for this.
stdenv = overrideCC stdenv gcc48;
};
syslinux = callPackage ../os-specific/linux/syslinux { };
sysstat = callPackage ../os-specific/linux/sysstat { };
@ -11793,8 +11790,6 @@ let
iptraf = callPackage ../applications/networking/iptraf { };
iptraf-ng = callPackage ../applications/networking/iptraf-ng { };
irssi = callPackage ../applications/networking/irc/irssi { };
irssi_fish = callPackage ../applications/networking/irc/irssi/fish { };
@ -11815,9 +11810,6 @@ let
jackmeter = callPackage ../applications/audio/jackmeter { };
jackmix = callPackage ../applications/audio/jackmix { };
jackmix_jack1 = jackmix.override { jack = jack1; };
jalv = callPackage ../applications/audio/jalv { };
jedit = callPackage ../applications/editors/jedit { };
@ -13946,7 +13938,6 @@ let
libcanberra = libcanberra_kde;
boost = boost155;
kdelibs = kdeApps_15_08.kdelibs;
subversionClient = subversionClient.override { branch = "1.8"; };
}
../desktops/kde-4.14;
@ -14974,8 +14965,6 @@ let
tvheadend = callPackage ../servers/tvheadend { };
urbit = callPackage ../misc/urbit { };
utf8proc = callPackage ../development/libraries/utf8proc { };
vault = goPackages.vault.bin // { outputs = [ "bin" ]; };
@ -15135,7 +15124,6 @@ aliases = with self; rec {
clangAnalyzer = clang-analyzer; # added 2015-02-20
cool-old-term = cool-retro-term; # added 2015-01-31
cv = progress; # added 2015-09-06
enblendenfuse = enblend-enfuse; # 2015-09-30
exfat-utils = exfat; # 2015-09-11
firefoxWrapper = firefox-wrapper;
fuse_exfat = exfat; # 2015-09-11

20
pkgs/top-level/go-packages.nix
View file

@ -679,26 +679,6 @@ let
subPackages = [ "./" ]; # don't try to build test fixtures
};
git-lfs = buildFromGitHub {
rev = "v1.0.0";
owner = "github";
repo = "git-lfs";
sha256 = "1zlg3rm5yxak6d88brffv1wpj0iq4qgzn6sgg8xn0pbnzxjd1284";
# Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
excludedPackages = [ "test" ];
preBuild = ''
pushd go/src/github.com/github/git-lfs
go generate ./commands
popd
'';
postInstall = ''
rm -v $bin/bin/{man,script}
'';
};
glide = buildFromGitHub {
rev = "0.5.0";
owner = "Masterminds";

10
pkgs/top-level/perl-packages.nix
View file

@ -715,15 +715,15 @@ let self = _self // overrides; _self = with self; {
};
Cairo = buildPerlPackage rec {
name = "Cairo-1.106";
name = "Cairo-1.105";
src = fetchurl {
url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
sha256 = "1i25kks408c54k2zxskvg54l5k3qadzm8n72ffga9jy7ic0h6j76";
sha256 = "0im025wy1346w7b7hi6im08bfn6x4ma0cxmjz6xnk8riizm1s84q";
};
buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.cairo ];
meta = {
homepage = http://gtk2-perl.sourceforge.net/;
description = "Perl interface to the cairo 2D vector graphics library";
description = "Perl interface to the cairo 2d vector graphics library";
maintainers = with maintainers; [ nckx ];
license = stdenv.lib.licenses.lgpl21Plus;
};
@ -4843,10 +4843,10 @@ let self = _self // overrides; _self = with self; {
};
Glib = buildPerlPackage rec {
name = "Glib-1.314";
name = "Glib-1.313";
src = fetchurl {
url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
sha256 = "13lhyksm7fgj6rgrgs06kr0hinbyhiq3lfr6gd2qal1j2w0rwzml";
sha256 = "162g342bhzy2ca4xwk63j10q9jycsps0s8l8y8pda70m7zcmr7xj";
};
buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ];
meta = {