forked from mirrors/nixpkgs
Merge branch 'staging'; security /cc #21642
This commit is contained in:
commit
07bf828bd9
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ];
|
||||
|
||||
preConfigurePhases = ''
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
|
|||
++ lib.optional enableGTK3 gtk3
|
||||
++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst_plugins_base ];
|
||||
|
||||
nativeBuildInputs = [autoconf213 which];
|
||||
nativeBuildInputs = [ autoconf213 which gnused ];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=browser"
|
||||
|
|
|
@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
|
|||
sha512 = "1f4579ac37b8ab98c91fe2e3e6742ba1b005ca9346d23f467d19e6af45eb457cab749bf91ed2a79f2058bd66f54da661da3ea5d5786f8c4b472d8a2a6c34db4b";
|
||||
};
|
||||
|
||||
# New sed no longer tolerates this mistake.
|
||||
postPatch = ''
|
||||
for f in mozilla/{js/src,}/configure; do
|
||||
substituteInPlace "$f" --replace '[:space:]*' '[[:space:]]*'
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
|
||||
[ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2
|
||||
python2 dbus dbus_glib pango freetype fontconfig xorg.libXi
|
||||
|
|
|
@ -30,12 +30,13 @@ pythonPackages.buildPythonApplication rec {
|
|||
export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/.zim-wrapped \
|
||||
--replace "sys.argv[0] = 'zim'" "sys.argv[0] = '$out/bin/zim'"
|
||||
# RuntimeError: could not create GtkClipboard object
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
python test.py
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "A desktop wiki";
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "root-${version}";
|
||||
version = "6.04.18";
|
||||
version = "6.08.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
||||
sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9";
|
||||
sha256 = "0530v1r4rvds52hgb13f00l3phhn76z6vii550mwv8bj3sl5070k";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake pcre pkgconfig python2 zlib lzma gsl ]
|
||||
|
@ -16,10 +16,6 @@ stdenv.mkDerivation rec {
|
|||
;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch";
|
||||
sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r";
|
||||
})
|
||||
./sw_vers.patch
|
||||
|
||||
# this prevents thisroot.sh from setting $p, which interferes with stdenv setup
|
||||
|
|
|
@ -42,12 +42,12 @@ diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
|
|||
@@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
|
||||
SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
|
||||
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
|
||||
- else(${SYSCTL_OUTPUT} MATCHES 64)
|
||||
- MESSAGE(STATUS "Found a 32bit system")
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
|
||||
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
|
||||
- SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
|
||||
- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
|
||||
- endif(${SYSCTL_OUTPUT} MATCHES 64)
|
||||
- endif()
|
||||
-
|
||||
|
|
|
@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
|
||||
'';
|
||||
|
||||
patches = [ ./darwin.patch ];
|
||||
patches = [
|
||||
./darwin.patch
|
||||
./r242056.patch
|
||||
];
|
||||
|
||||
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
|
|
16
pkgs/development/compilers/llvm/3.7/libc++/r242056.patch
Normal file
16
pkgs/development/compilers/llvm/3.7/libc++/r242056.patch
Normal file
|
@ -0,0 +1,16 @@
|
|||
--- a/include/string 2015/07/13 20:04:56 242056
|
||||
+++ b/include/string 2015/07/18 20:40:46 242623
|
||||
@@ -1936,7 +1936,12 @@
|
||||
template <class _CharT, class _Traits, class _Allocator>
|
||||
inline _LIBCPP_INLINE_VISIBILITY
|
||||
basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a)
|
||||
- : __r_(__a)
|
||||
+#if _LIBCPP_STD_VER <= 14
|
||||
+ _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)
|
||||
+#else
|
||||
+ _NOEXCEPT
|
||||
+#endif
|
||||
+: __r_(__a)
|
||||
{
|
||||
#if _LIBCPP_DEBUG_LEVEL >= 2
|
||||
__get_db()->__insert_c(this);
|
|
@ -6,7 +6,7 @@
|
|||
, openssl
|
||||
, readline
|
||||
, sqlite
|
||||
, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false
|
||||
, tcl ? null, tk ? null, tix ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false
|
||||
, zlib
|
||||
, callPackage
|
||||
, self
|
||||
|
@ -150,6 +150,10 @@ in stdenv.mkDerivation {
|
|||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
postPatch = optionalString (x11Support && (tix != null)) ''
|
||||
substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
''
|
||||
# needed for some packages, especially packages that backport
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, openssl
|
||||
, readline
|
||||
, sqlite
|
||||
, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
|
||||
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
|
||||
, zlib
|
||||
, callPackage
|
||||
, self
|
||||
|
@ -50,6 +50,10 @@ in stdenv.mkDerivation {
|
|||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
||||
postPatch = optionalString (x11Support && (tix != null)) ''
|
||||
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
for i in /usr /sw /opt /pkg; do # improve purity
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, openssl
|
||||
, readline
|
||||
, sqlite
|
||||
, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
|
||||
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
|
||||
, zlib
|
||||
, callPackage
|
||||
, self
|
||||
|
@ -55,6 +55,10 @@ in stdenv.mkDerivation {
|
|||
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
|
||||
'';
|
||||
|
||||
postPatch = optionalString (x11Support && (tix != null)) ''
|
||||
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
for i in /usr /sw /opt /pkg; do # improve purity
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, openssl
|
||||
, readline
|
||||
, sqlite
|
||||
, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
|
||||
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
|
||||
, zlib
|
||||
, callPackage
|
||||
, self
|
||||
|
@ -55,6 +55,10 @@ in stdenv.mkDerivation {
|
|||
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
|
||||
'';
|
||||
|
||||
postPatch = optionalString (x11Support && (tix != null)) ''
|
||||
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
for i in /usr /sw /opt /pkg; do # improve purity
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
, openssl
|
||||
, readline
|
||||
, sqlite
|
||||
, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
|
||||
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
|
||||
, zlib
|
||||
, callPackage
|
||||
, self
|
||||
|
@ -55,6 +55,10 @@ in stdenv.mkDerivation {
|
|||
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
|
||||
'';
|
||||
|
||||
postPatch = optionalString (x11Support && (tix != null)) ''
|
||||
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
for i in /usr /sw /opt /pkg; do # improve purity
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
|
||||
, sqlite, openssl, ncurses, python, expat, tcl, tk, xlibsWrapper, libX11
|
||||
, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
|
||||
, makeWrapper, callPackage, self, gdbm, db
|
||||
# For the Python package set
|
||||
, pkgs, packageOverrides ? (self: super: {})
|
||||
|
@ -35,6 +35,7 @@ let
|
|||
};
|
||||
in ''
|
||||
patch lib-python/2.7/test/test_pyexpat.py < '${expatch}'
|
||||
substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
buildInputs = [ bzip2 openssl pkgconfig python libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ]
|
||||
|
|
|
@ -35,7 +35,7 @@ makeSetupHook {
|
|||
import sys
|
||||
import site
|
||||
import functools
|
||||
sys.argv[0] = '"'$(basename "$f")'"'
|
||||
sys.argv[0] = '"'$(readlink -f "$f")'"'
|
||||
functools.reduce(lambda k, p: site.addsitedir(p, k), ['"$([ -n "$program_PYTHONPATH" ] && (echo "'$program_PYTHONPATH'" | sed "s|:|','|g") || true)"'], site._init_pathinfo())
|
||||
'';
|
||||
|
||||
|
|
|
@ -11,8 +11,6 @@ stdenv.mkDerivation {
|
|||
owner = "bohoomil";
|
||||
};
|
||||
|
||||
phases = "$prePhases unpackPhase installPhase $postPhases";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/etc/fonts/conf.d
|
||||
cp conf.d.infinality/*.conf $out/etc/fonts/conf.d
|
||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ autoconf automake libtool ];
|
||||
|
||||
preConfigurePhases = "./bootstrap";
|
||||
preConfigure = "./bootstrap";
|
||||
|
||||
meta = {
|
||||
description = "A program and library for changing the tempo, pitch and playback rate of audio";
|
||||
|
|
55
pkgs/development/libraries/tix/default.nix
Normal file
55
pkgs/development/libraries/tix/default.nix
Normal file
|
@ -0,0 +1,55 @@
|
|||
{ stdenv, fetchurl, tcl, tk, fetchpatch } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.4.3";
|
||||
name = "tix-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
|
||||
sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "tix-8.4.3-tcl8.5.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
|
||||
sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj";
|
||||
})
|
||||
] ++ stdenv.lib.optional (tcl.release == "8.6")
|
||||
(fetchpatch {
|
||||
name = "tix-8.4.3-tcl8.6.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
|
||||
sha256 = "1jaz0l22xj7x1k4rb9ia6i1psnbwk4pblgq4gfvya7gg7fbb7r36";
|
||||
})
|
||||
;
|
||||
buildInputs = [ tcl tk ];
|
||||
# the configure script expects to find the location of the sources of
|
||||
# tcl and tk in {tcl,tk}Config.sh
|
||||
# In fact, it only needs some private headers. We copy them in
|
||||
# the private_headers folders and trick the configure script into believing
|
||||
# the sources are here.
|
||||
preConfigure = ''
|
||||
mkdir -p private_headers/generic
|
||||
< ${tcl}/lib/tclConfig.sh sed "s@TCL_SRC_DIR=.*@TCL_SRC_DIR=private_headers@" > tclConfig.sh
|
||||
< ${tk}/lib/tkConfig.sh sed "s@TK_SRC_DIR=.*@TK_SRC_DIR=private_headers@" > tkConfig.sh
|
||||
for i in ${tcl}/include/* ${tk.dev}/include/*; do
|
||||
ln -s $i private_headers/generic;
|
||||
done;
|
||||
'';
|
||||
configureFlags = ''
|
||||
--with-tclinclude=${tcl}/include
|
||||
--with-tclconfig=.
|
||||
--with-tkinclude=${tk.dev}/include
|
||||
--with-tkconfig=.
|
||||
--libdir=''${prefix}/lib
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A widget library for Tcl/Tk";
|
||||
homepage = http://tix.sourceforge.net/;
|
||||
platforms = platforms.all;
|
||||
license = with licenses; [
|
||||
bsd2 # tix
|
||||
gpl2 # patches from portage
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -16,6 +16,7 @@ stdenv.mkDerivation {
|
|||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/wish* $out/bin/wish
|
||||
cp ../{unix,generic}/*.h $out/include
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
|||
};
|
||||
buildInputs = [ automake autoconf libtool lzma ];
|
||||
setSourceRoot = "cd openzim-*/zimlib; export sourceRoot=`pwd`";
|
||||
preConfigurePhases = [ "./autogen.sh" ];
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
meta = {
|
||||
description = "Library for reading and writing ZIM files (file format for storing Web content offline)";
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnum4-1.4.17";
|
||||
name = "gnum4-1.4.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/m4/m4-1.4.17.tar.bz2";
|
||||
sha256 = "0w0da1chh12mczxa5lnwzjk9czi3dq6gnnndbpa6w4rj76b1yklf";
|
||||
url = "mirror://gnu/m4/m4-1.4.18.tar.bz2";
|
||||
sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
37
pkgs/development/tools/parsing/flex/2.6.1.nix
Normal file
37
pkgs/development/tools/parsing/flex/2.6.1.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ stdenv, fetchurl, bison, m4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flex-2.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz";
|
||||
sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw";
|
||||
};
|
||||
|
||||
buildInputs = [ bison ];
|
||||
|
||||
propagatedNativeBuildInputs = [ m4 ];
|
||||
|
||||
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
|
||||
sed -i Makefile -e 's/-no-undefined//;'
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
|
||||
# disable tests which can't run on build machine
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.in --replace "tests" " ";
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export ac_cv_func_malloc_0_nonnull=yes
|
||||
export ac_cv_func_realloc_0_nonnull=yes
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/westes/flex;
|
||||
description = "A fast lexical analyser generator";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
|
@ -1,11 +1,12 @@
|
|||
{ stdenv, fetchurl, bison, m4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flex-2.6.1";
|
||||
name = "flex-${version}";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz";
|
||||
sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw";
|
||||
url = "https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz";
|
||||
sha256 = "1an2cn2z85mkpgqcinh1fhhcd7993qm2lil1yxic8iz76ci79ck8";
|
||||
};
|
||||
|
||||
buildInputs = [ bison ];
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv, lib, pkgArches,
|
||||
name, version, src, monos, geckos, platforms,
|
||||
pkgconfig, fontforge, makeWrapper, flex, bison,
|
||||
# flex 2.6.3 causes: undefined reference to `yywrap'
|
||||
pkgconfig, fontforge, makeWrapper, flex_2_6_1, bison,
|
||||
supportFlags,
|
||||
buildScript ? null, configureFlags ? ""
|
||||
}:
|
||||
|
@ -16,7 +17,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
|
|||
inherit name src configureFlags;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig fontforge makeWrapper flex bison
|
||||
pkgconfig fontforge makeWrapper flex_2_6_1 bison
|
||||
];
|
||||
|
||||
buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:
|
||||
|
|
|
@ -11,7 +11,6 @@ stdenv.mkDerivation {
|
|||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
phases = "$prePhases unpackPhase installPhase fixupPhase $postPhases";
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/themes/orion
|
||||
cp -r gtk-2.0 gtk-3.0 metacity-1 openbox-3 xfwm4 $out/share/themes/orion
|
||||
|
|
|
@ -13,10 +13,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ flex ];
|
||||
|
||||
# Temporary work-around for problems after flex security update:
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835542
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=("PREFIX=$out")
|
||||
makeFlagsArray+=("DESTDIR=$out")
|
||||
|
|
|
@ -1,118 +0,0 @@
|
|||
{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, binutils ? null, bison }:
|
||||
|
||||
assert interactive -> readline != null;
|
||||
assert stdenv.isDarwin -> binutils != null;
|
||||
|
||||
let
|
||||
version = "4.3";
|
||||
realName = "bash-${version}";
|
||||
shortName = "bash43";
|
||||
baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
|
||||
sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
|
||||
|
||||
inherit (stdenv.lib) optional optionalString;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${realName}-p${toString (builtins.length patches)}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/bash/${realName}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
outputs = [ "out" "doc" "info" ];
|
||||
|
||||
# the man pages are small and useful enough
|
||||
outputMan = if interactive then "out" else null;
|
||||
|
||||
NIX_CFLAGS_COMPILE = ''
|
||||
-DSYS_BASHRC="/etc/bashrc"
|
||||
-DSYS_BASH_LOGOUT="/etc/bash_logout"
|
||||
-DDEFAULT_PATH_VALUE="/no-such-path"
|
||||
-DSTANDARD_UTILS_PATH="/no-such-path"
|
||||
-DNON_INTERACTIVE_LOGIN_SHELLS
|
||||
-DSSH_SOURCE_BASHRC
|
||||
'';
|
||||
|
||||
patchFlags = "-p0";
|
||||
|
||||
patches =
|
||||
(let
|
||||
patch = nr: sha256:
|
||||
fetchurl {
|
||||
url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
|
||||
inherit sha256;
|
||||
};
|
||||
in
|
||||
import ./bash-4.3-patches.nix patch)
|
||||
++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
|
||||
|
||||
crossAttrs = {
|
||||
configureFlags = baseConfigureFlags +
|
||||
" bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" +
|
||||
optionalString stdenv.isCygwin ''
|
||||
--without-libintl-prefix --without-libiconv-prefix
|
||||
--with-installed-readline
|
||||
bash_cv_dev_stdin=present
|
||||
bash_cv_dev_fd=standard
|
||||
bash_cv_termcap_lib=libncurses
|
||||
'';
|
||||
};
|
||||
|
||||
configureFlags = baseConfigureFlags;
|
||||
|
||||
# Note: Bison is needed because the patches above modify parse.y.
|
||||
nativeBuildInputs = [bison]
|
||||
++ optional (texinfo != null) texinfo
|
||||
++ optional interactive readline
|
||||
++ optional stdenv.isDarwin binutils;
|
||||
|
||||
# Bash randomly fails to build because of a recursive invocation to
|
||||
# build `version.h'.
|
||||
enableParallelBuilding = false;
|
||||
|
||||
postInstall = ''
|
||||
ln -s bash "$out/bin/sh"
|
||||
'';
|
||||
|
||||
postFixup = if interactive
|
||||
then ''
|
||||
substituteInPlace "$out/bin/bashbug" \
|
||||
--replace '${stdenv.shell}' "$out/bin/bash"
|
||||
''
|
||||
# most space is taken by locale data
|
||||
else ''
|
||||
rm -r "$out/share" "$out/bin/bashbug"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.gnu.org/software/bash/;
|
||||
description =
|
||||
"GNU Bourne-Again Shell, the de facto standard shell on Linux" +
|
||||
(if interactive then " (for interactive use)" else "");
|
||||
|
||||
longDescription = ''
|
||||
Bash is the shell, or command language interpreter, that will
|
||||
appear in the GNU operating system. Bash is an sh-compatible
|
||||
shell that incorporates useful features from the Korn shell
|
||||
(ksh) and C shell (csh). It is intended to conform to the IEEE
|
||||
POSIX P1003.2/ISO 9945.2 Shell and Tools standard. It offers
|
||||
functional improvements over sh for both programming and
|
||||
interactive use. In addition, most sh scripts can be run by
|
||||
Bash without modification.
|
||||
'';
|
||||
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
platforms = platforms.all;
|
||||
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
shellPath = "/bin/bash";
|
||||
};
|
||||
}
|
|
@ -12,11 +12,21 @@ let
|
|||
baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
|
||||
sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq";
|
||||
|
||||
upstreamPatches =
|
||||
let
|
||||
patch = nr: sha256:
|
||||
fetchurl {
|
||||
url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
|
||||
inherit sha256;
|
||||
};
|
||||
in
|
||||
import ./bash-4.4-patches.nix patch;
|
||||
|
||||
inherit (stdenv.lib) optional optionalString;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${realName}-p${toString (builtins.length patches)}";
|
||||
name = "${realName}-p${toString (builtins.length upstreamPatches)}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/bash/${realName}.tar.gz";
|
||||
|
@ -41,15 +51,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patchFlags = "-p0";
|
||||
|
||||
patches =
|
||||
(let
|
||||
patch = nr: sha256:
|
||||
fetchurl {
|
||||
url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
|
||||
inherit sha256;
|
||||
};
|
||||
in
|
||||
import ./bash-4.4-patches.nix patch)
|
||||
patches = upstreamPatches
|
||||
++ [ (fetchurl {
|
||||
# https://security.gentoo.org/glsa/201701-02
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-shells"
|
||||
+ "/bash/files/bash-4.4-popd-offset-overflow.patch"
|
||||
+ "?id=1bf1ceeb04a2f57e1e5e1636a8c288c4d0db6682";
|
||||
sha256 = "02n08lw5spvsc2b1bll0gr6mg4qxcg7pzfjkw7ji5w7bjcikccbm";
|
||||
}) ]
|
||||
++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
|
||||
|
||||
crossAttrs = {
|
||||
|
|
|
@ -47,4 +47,6 @@ patch: [
|
|||
(patch "044" "16bzaq9fs2kaw2n2k6vvljkjw5k5kx06isnq8hxkfrxz60384f4k")
|
||||
(patch "045" "08q02mj9imp2njpgm6f5q5m61i7qzp33rbxxzarixalyisbw6vms")
|
||||
(patch "046" "13v8dymwj83wcvrfayjqrs5kqar05bcj4zpiacrjkkchnsk5dd5k")
|
||||
(patch "047" "0jkwqviwkqdc13wv3q0g0kapjr68ggs1xzhqy696pfkqgvg4i4n6")
|
||||
(patch "048" "18nzlk1idwkq0xd54s83lx8kam8kcvz7yc0mw6hnq2ax3i2ib0jv")
|
||||
]
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
# Automatically generated by `update-patch-set.sh'; do not edit.
|
||||
|
||||
patch: [
|
||||
(patch "001" "03vzy7qwjdd5qvl3ydg99naazas2qmyd0yhnrflgjbbm64axja1y")
|
||||
(patch "002" "0lrwq6vyqism3yqv9s7kzaf3dsl4q5w9r5svcqz279qp7qca083h")
|
||||
(patch "003" "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi")
|
||||
(patch "004" "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d")
|
||||
(patch "005" "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2")
|
||||
]
|
||||
|
|
|
@ -87,8 +87,9 @@ rec {
|
|||
|
||||
|
||||
coreutilsMinimal = (pkgs.coreutils.override (args: {
|
||||
# We want coreutils without ACL support.
|
||||
# We want coreutils without ACL/attr support.
|
||||
aclSupport = false;
|
||||
attrSupport = false;
|
||||
# Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
|
||||
singleBinary = "symlinks";
|
||||
})).crossDrv;
|
||||
|
|
|
@ -6,8 +6,9 @@ rec {
|
|||
|
||||
|
||||
coreutilsMinimal = coreutils.override (args: {
|
||||
# We want coreutils without ACL support.
|
||||
# We want coreutils without ACL/attr support.
|
||||
aclSupport = false;
|
||||
attrSupport = false;
|
||||
# Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
|
||||
singleBinary = "symlinks";
|
||||
});
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, perl, xz, gmp ? null
|
||||
, aclSupport ? false, acl ? null
|
||||
, attrSupport ? false, attr ? null
|
||||
, selinuxSupport? false, libselinux ? null, libsepol ? null
|
||||
, autoconf, automake114x, texinfo
|
||||
, withPrefix ? false
|
||||
|
@ -44,12 +45,14 @@ let
|
|||
|
||||
buildInputs = [ gmp ]
|
||||
++ optional aclSupport acl
|
||||
++ optional attrSupport attr
|
||||
++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch
|
||||
++ optionals selinuxSupport [ libselinux libsepol ];
|
||||
|
||||
crossAttrs = {
|
||||
buildInputs = [ gmp.crossDrv ]
|
||||
++ optional aclSupport acl.crossDrv
|
||||
++ optional attrSupport attr.crossDrv
|
||||
++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ]
|
||||
++ optional (stdenv.ccCross.libc ? libiconv)
|
||||
stdenv.ccCross.libc.libiconv.crossDrv;
|
||||
|
@ -90,8 +93,6 @@ let
|
|||
|
||||
makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
|
||||
|
||||
postFixup = ""; # FIXME: remove on next mass rebuild
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/coreutils/;
|
||||
description = "The basic file, shell and text manipulation utilities of the GNU operating system";
|
||||
|
|
|
@ -54,6 +54,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
# Work around a bug in the generated flex lexer (upstream flex bug?)
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
preConfigure =
|
||||
'' for i in "tests/util/"*.in
|
||||
do
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "unbound-${version}";
|
||||
version = "1.5.10";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://unbound.net/downloads/${name}.tar.gz";
|
||||
sha256 = "11lli8jgq4n917gcx6nw728g1hqc2lszwlxa5mdb78m2ri7qp6x3";
|
||||
sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
|
||||
|
|
|
@ -5,11 +5,11 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
pname = "pyunbound";
|
||||
name = "${pname}-${version}";
|
||||
version = "1.5.9";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://unbound.net/downloads/unbound-${version}.tar.gz";
|
||||
sha256 = "01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990";
|
||||
sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl expat libevent swig python ];
|
||||
|
|
31
pkgs/tools/text/gnused/422.nix
Normal file
31
pkgs/tools/text/gnused/422.nix
Normal file
|
@ -0,0 +1,31 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gnused-4.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnu/sed/sed-4.2.2.tar.bz2;
|
||||
sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
|
||||
};
|
||||
|
||||
outputs = [ "out" "info" ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/sed/;
|
||||
description = "GNU sed, a batch stream editor";
|
||||
|
||||
longDescription = ''
|
||||
Sed (stream editor) isn't really a true text editor or text
|
||||
processor. Instead, it is used to filter text, i.e., it takes
|
||||
text input and performs some operation (or set of operations) on
|
||||
it and outputs the modified text. Sed is typically used for
|
||||
extracting part of a file using pattern matching or substituting
|
||||
multiple occurrences of a string within a file.
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
|
@ -1,15 +1,19 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchurl, perl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gnused-4.2.2";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnused-${version}";
|
||||
version = "4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnu/sed/sed-4.2.2.tar.bz2;
|
||||
sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
|
||||
url = "mirror://gnu/sed/sed-${version}.tar.xz";
|
||||
sha256 = "1anhdgah8h423hlmn9hwzxzr7hjbqjm6hxq3z1p7p7nf8640vhj7";
|
||||
};
|
||||
|
||||
outputs = [ "out" "info" ];
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
preConfigure = "patchShebangs ./build-aux/help2man";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/sed/;
|
||||
description = "GNU sed, a batch stream editor";
|
||||
|
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ];
|
||||
setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`";
|
||||
preConfigurePhases = [ "./autogen.sh" ];
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
meta = {
|
||||
description = "A tool to serve ZIM files using HTTP";
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ automake autoconf libtool lzma pkgconfig zimlib file zlib ];
|
||||
setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`";
|
||||
preConfigurePhases = [ "./autogen.sh" ];
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
meta = {
|
||||
description = "A console tool to create ZIM files";
|
||||
|
|
|
@ -1277,6 +1277,7 @@ in
|
|||
|
||||
coreutils = callPackage ../tools/misc/coreutils {
|
||||
aclSupport = stdenv.isLinux;
|
||||
attrSupport = stdenv.isLinux;
|
||||
};
|
||||
|
||||
coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; };
|
||||
|
@ -1932,6 +1933,8 @@ in
|
|||
gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
|
||||
|
||||
gnused = callPackage ../tools/text/gnused { };
|
||||
# This is an easy work-around for [:space:] problems.
|
||||
gnused_422 = callPackage ../tools/text/gnused/422.nix { };
|
||||
|
||||
gnutar = callPackage ../tools/archivers/gnutar { };
|
||||
|
||||
|
@ -4540,7 +4543,7 @@ in
|
|||
|
||||
### SHELLS
|
||||
|
||||
bash = lowPrio (callPackage ../shells/bash/4.3.nix {
|
||||
bash = lowPrio (callPackage ../shells/bash/4.4.nix {
|
||||
texinfo = null;
|
||||
interactive = stdenv.isCygwin; # patch for cygwin requires readline support
|
||||
});
|
||||
|
@ -6270,6 +6273,7 @@ in
|
|||
jdepend = callPackage ../development/tools/analysis/jdepend { };
|
||||
|
||||
flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
|
||||
flex_2_6_1 = callPackage ../development/tools/parsing/flex/2.6.1.nix { };
|
||||
flex = callPackage ../development/tools/parsing/flex/default.nix { };
|
||||
|
||||
flexcpp = callPackage ../development/tools/parsing/flexc++ { };
|
||||
|
@ -9536,6 +9540,8 @@ in
|
|||
|
||||
tivodecode = callPackage ../applications/video/tivodecode { };
|
||||
|
||||
tix = callPackage ../development/libraries/tix { };
|
||||
|
||||
tk = tk-8_6;
|
||||
|
||||
tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
|
||||
|
@ -13216,6 +13222,7 @@ in
|
|||
libpng = libpng_apng;
|
||||
enableGTK3 = false;
|
||||
python = python2;
|
||||
gnused = gnused_422;
|
||||
}) firefox-unwrapped firefox-esr-unwrapped;
|
||||
|
||||
firefox = wrapFirefox firefox-unwrapped { };
|
||||
|
|
Loading…
Reference in a new issue