From a9b9856c37db7212fcc8af410f49054abcff7814 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 23 May 2015 18:38:51 -0700 Subject: [PATCH 001/127] New package: cli53 (AWS Route53 admin CLI tool) --- pkgs/tools/admin/cli53/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/admin/cli53/default.nix diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix new file mode 100644 index 000000000000..2fa54796e4c4 --- /dev/null +++ b/pkgs/tools/admin/cli53/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, pythonPackages, fetchurl }: + +buildPythonPackage rec { + name = "cli53-${version}"; + namePrefix = ""; # Suppress "python27-" name prefix + version = "0.4.4"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/cli53/${name}.tar.gz"; + sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig"; + }; + + propagatedBuildInputs = with pythonPackages; [ + argparse + boto + dns + ]; + + meta = { + description = "CLI tool for the Amazon Route 53 DNS service"; + homepage = https://github.com/barnybug/cli53; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ benley ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f55c035c3a94..01c88e44253c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -764,6 +764,8 @@ let ccnet = callPackage ../tools/networking/ccnet { }; + cli53 = callPackage ../tools/admin/cli53 { }; + cloud-init = callPackage ../tools/virtualization/cloud-init { }; consul = goPackages.consul; From 4587819638a2785f7f13b9dc78a32157dd7ce547 Mon Sep 17 00:00:00 2001 From: codyopel Date: Wed, 27 May 2015 11:48:03 -0400 Subject: [PATCH 002/127] openjpeg: refactor, fixes #8017 + Disable JPIP which requires Java + fix typo in nativeBuildInputs, which fixes pkgconfig --- pkgs/development/libraries/openjpeg/1.x.nix | 7 +- pkgs/development/libraries/openjpeg/2.0.1.nix | 10 --- pkgs/development/libraries/openjpeg/2.0.nix | 7 ++ pkgs/development/libraries/openjpeg/2.1.nix | 7 +- .../libraries/openjpeg/generic.nix | 69 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 40 insertions(+), 64 deletions(-) delete mode 100644 pkgs/development/libraries/openjpeg/2.0.1.nix create mode 100644 pkgs/development/libraries/openjpeg/2.0.nix diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix index 14886f021421..2147bab0a6aa 100644 --- a/pkgs/development/libraries/openjpeg/1.x.nix +++ b/pkgs/development/libraries/openjpeg/1.x.nix @@ -1,10 +1,7 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // rec { version = "${branch}.2"; branch = "1.5"; - src = fetchurl { - url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz"; - sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm"; - }; + sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm"; }) diff --git a/pkgs/development/libraries/openjpeg/2.0.1.nix b/pkgs/development/libraries/openjpeg/2.0.1.nix deleted file mode 100644 index 25575450b477..000000000000 --- a/pkgs/development/libraries/openjpeg/2.0.1.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.0.1"; - branch = "2"; - src = fetchurl { - url = "mirror://sourceforge/openjpeg.mirror/openjpeg-${version}.tar.gz"; - sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"; - }; -}) diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix new file mode 100644 index 000000000000..034942b25dde --- /dev/null +++ b/pkgs/development/libraries/openjpeg/2.0.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.0.1"; + branch = "2"; + sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"; +}) diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix index 7e48b656ae28..f6b3ce3a9cd8 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.1.nix @@ -1,10 +1,7 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // rec { version = "${branch}.0"; branch = "2.1"; - src = fetchurl { - url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz"; - sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"; - }; + sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"; }) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 3fae65d9bd29..717e5a4de2cf 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -1,85 +1,70 @@ -{ stdenv, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ -, sharedLibsSupport ? true # Build shared libraries -, codecSupport ? true # Codec executables +{ stdenv, fetchurl, cmake, pkgconfig +, libpng, libtiff, lcms2 , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables -, jpipLibSupport ? true # JPIP library & executables +, jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl ? null, fcgi ? null # JPIP Server #, opjViewerSupport ? false, wxGTK ? null # OPJViewer executable -, openjpegJarSupport ? false, jdk ? null # Openjpeg jar (Java) +, openjpegJarSupport ? false # Openjpeg jar (Java) , jp3dSupport ? true # # JP3D comp , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build , testsSupport ? false +, jdk ? null # Inherit generics -, branch, src, version, ... +, branch, sha256, version, ... }: -assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null)); +assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; #assert opjViewerSupport -> (wxGTK != null); -assert openjpegJarSupport -> (jdk != null); -assert testsSupport -> codecSupport; +assert (openjpegJarSupport || jpipLibSupport) -> jdk != null; let - mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; + inherit (stdenv.lib) optional optionals; + mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in -with stdenv.lib; stdenv.mkDerivation rec { name = "openjpeg-${version}"; - inherit branch; - inherit version; - inherit src; + + src = fetchurl { + url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz"; + inherit sha256; + }; cmakeFlags = [ - (mkFlag sharedLibsSupport "BUILD_SHARED_LIBS") - (mkFlag codecSupport "BUILD_CODEC") + "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_CODEC=ON" (mkFlag mj2Support "BUILD_MJ2") (mkFlag jpwlLibSupport "BUILD_JPWL") (mkFlag jpipLibSupport "BUILD_JPIP") (mkFlag jpipServerSupport "BUILD_JPIP_SERVER") #(mkFlag opjViewerSupport "BUILD_VIEWER") + "-DBUILD_VIEWER=OFF" (mkFlag openjpegJarSupport "BUILD_JAVA") (mkFlag jp3dSupport "BUILD_JP3D") (mkFlag thirdPartySupport "BUILD_THIRDPARTY") (mkFlag testsSupport "BUILD_TESTING") - ] ++ stdenv.lib.optionals stdenv.isDarwin - [ "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib" ]; - nativebuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ cmake ] + buildInputs = [ ] ++ optionals jpipServerSupport [ curl fcgi ] #++ optional opjViewerSupport wxGTK - ++ optional openjpegJarSupport jdk; + ++ optional (openjpegJarSupport || jpipLibSupport) jdk; propagatedBuildInputs = [ libpng libtiff lcms2 ]; - postInstall = glib.flattenInclude + '' - mkdir -p "$out/lib/pkgconfig" - cat > "$out/lib/pkgconfig/libopenjp2.pc" < Date: Sat, 16 May 2015 16:42:40 +0200 Subject: [PATCH 003/127] e19: updates for 1.14.0 - libraries and applications updated to the latest - the "elementary getting started" (https://docs.enlightenment.org/auto/elementary/group__Start.html) works with just `pkg-config --cflags --libs elementary` - switched from lua-old to elua --- pkgs/desktops/e19/econnman.nix | 6 +++--- pkgs/desktops/e19/efl-elua.patch | 14 ++++++++++++++ pkgs/desktops/e19/efl-setup-hook.sh | 8 -------- pkgs/desktops/e19/efl.nix | 26 +++++++++++++++++--------- pkgs/desktops/e19/elementary.nix | 15 +++++++-------- pkgs/desktops/e19/elementary.patch | 18 ++++++++++++++++++ pkgs/desktops/e19/emotion.nix | 10 ++++------ pkgs/desktops/e19/enlightenment.nix | 8 ++++---- pkgs/desktops/e19/evas.nix | 6 +++--- pkgs/desktops/e19/rage.nix | 21 +++------------------ pkgs/desktops/e19/terminology.nix | 9 +-------- pkgs/top-level/python-packages.nix | 12 ++++++------ 12 files changed, 80 insertions(+), 73 deletions(-) create mode 100644 pkgs/desktops/e19/efl-elua.patch delete mode 100755 pkgs/desktops/e19/efl-setup-hook.sh create mode 100644 pkgs/desktops/e19/elementary.patch diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 08d7a8c3e735..4d80b633bd32 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_13 python27Packages.dbus e19.elementary ]; + propagatedBuildInputs = [ python27Packages.pythonefl_1_14 python27Packages.dbus e19.elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_13}/lib/python2.7/site-packages + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_14}/lib/python2.7/site-packages ''; meta = { description = "A user interface for the connman network connection manager"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/desktops/e19/efl-elua.patch b/pkgs/desktops/e19/efl-elua.patch new file mode 100644 index 000000000000..96c42b3ff3ca --- /dev/null +++ b/pkgs/desktops/e19/efl-elua.patch @@ -0,0 +1,14 @@ +--- ./src/scripts/elua/core/util.lua.old 2015-05-17 11:59:57.307743243 +0200 ++++ ./src/scripts/elua/core/util.lua 2015-05-17 12:39:11.906797377 +0200 +@@ -159,7 +159,10 @@ + local ev = os.getenv("ELUA_" .. libname:upper() .. "_LIBRARY_PATH") + local succ, v = load_lib(libname, ev) + if not succ then +- error(v, 2) ++ succ, v = load_lib(libname, "$out/lib") ++ if not succ then ++ error(v, 2) ++ end + end + lib = v + loaded_libs[libname] = lib diff --git a/pkgs/desktops/e19/efl-setup-hook.sh b/pkgs/desktops/e19/efl-setup-hook.sh deleted file mode 100755 index d98f24b4c04b..000000000000 --- a/pkgs/desktops/e19/efl-setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addDbusIncludePath () { - if test -d "$1/include/dbus-1.0" - then - export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include" - fi -} - -envHooks=(${envHooks[@]} addDbusIncludePath) diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index c8860a5f7daa..ada0f4650d27 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.13.2"; + version = "1.14.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "196293zf4pbyd5acs4nzb818yql9r67709ccfj7k3siyws6lsh4q"; + sha256 = "0sb2104b2rayr2ag0n3g8zqds9nxd53mlyvq7650c3cy8hws5a1h"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto - xlibs.libX11 udev utillinuxCurses luajit ]; + xlibs.libX11 udev utillinuxCurses ]; propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr - xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 + xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat luajit harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm libinput ]; @@ -25,23 +25,31 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" - "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old" + "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "ac_ct_CXX=foo" ]; NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; + patches = [ ./efl-elua.patch ]; + preConfigure = '' export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" + export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH" + ''; + + postInstall = '' + substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out" + modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done) + substituteInPlace "$out/lib/pkgconfig/efl.pc" --replace 'Cflags: -I''${includedir}/efl-1' \ + 'Cflags: -I''${includedir}/eina-1/eina'"$modules" ''; enableParallelBuilding = true; - setupHook = ./efl-setup-hook.sh; - meta = { description = "Enlightenment Core libraries"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 28ce894bfc74..30d0761c99ec 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: +{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.13.2"; + version = "1.14.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "0f8hz60aj4ar8lqnc63nlxkpf3b51scjalgy1iphgjc27hzxcb9i"; + sha256 = "03h9sv5c3473wxf7hcimdf80d2phxl81yv0kzngx4g1b6cdwl1ma"; }; - buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 -I${e19.efl}/include/efl-1 $NIX_CFLAGS_COMPILE" - ''; + buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ]; + patches = [ ./elementary.patch ]; enableParallelBuilding = true; meta = { description = "Widget set/toolkit"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl2; }; diff --git a/pkgs/desktops/e19/elementary.patch b/pkgs/desktops/e19/elementary.patch new file mode 100644 index 000000000000..32080c81cb38 --- /dev/null +++ b/pkgs/desktops/e19/elementary.patch @@ -0,0 +1,18 @@ +--- a/elementary.pc.in 2015-05-16 21:08:14.321148417 +0200 ++++ b/elementary.pc.in 2015-05-16 21:08:30.643412725 +0200 +@@ -14,4 +14,4 @@ + Requires.private: @requirement_elm_pc@ + Version: @VERSION@ + Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@ +-Cflags: -I${includedir}/elementary-@VMAJ@ ++Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_PC_CFLAGS@ +--- a/Makefile.am 2015-05-16 21:08:14.322148433 +0200 ++++ b/Makefile.am 2015-05-16 21:08:30.643412725 +0200 +@@ -84,6 +84,7 @@ + -e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \ + -e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \ + -e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \ ++-e 's,@ELEMENTARY_PC_CFLAGS\@,$(ELEMENTARY_PC_CFLAGS),g' \ + < $< > $@ || rm $@ + + pc_verbose = $(pc_verbose_@AM_V@) diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index bffc2e70f59a..6aa4089f52f8 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -1,19 +1,17 @@ { stdenv, fetchurl, pkgconfig, e19, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3"; + sha256 = "1n1a5n2wi68n8gjw4yk6cyf11djpqpac0025vysn5w6dqgccfic3"; }; buildInputs = [ pkgconfig e19.efl vlc ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - ''; + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ]; meta = { description = "Extra video decoders"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 2cccf3a0dfda..7e770ffe00b7 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.4"; + version = "0.19.5"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0r3bad700cfx5sq8y61dbz3hxdx9n3nf5hzx40ryqld75yxzwxz7"; + sha256 = "0j66x7x76fbgqfw6fi77v8qy50slw3jnsq3vvs82rrfvniabm8wc"; }; buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/elocation-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export USER_SESSION_DIR=$prefix/lib/systemd/user substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "The Compositing Window Manager and Desktop Shell"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index 3ec3d53c69a1..a35b4c583215 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.13.2"; + version = "1.14.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "06m8p8k8dpyvzdm690zhdzcr7n0ld12bcgjdssjfl66lil5z2mc4"; + sha256 = "04m8vsrigbsg9hm94lxac56frdxil1bib0bjmspa6xsfgi12afwl"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { description = "Extra image decoders"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/e19/rage.nix index 0ccdb3bf3e39..19c99ac17eb9 100644 --- a/pkgs/desktops/e19/rage.nix +++ b/pkgs/desktops/e19/rage.nix @@ -2,28 +2,13 @@ , makeWrapper, lib }: stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.1.1"; + version = "0.1.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "0jdhbzmnvl0i2zzmjs1wgvxmnv0lm76k7h5llbb8ai34xh4yp3fi"; + sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg"; }; buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig makeWrapper ]; - NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/evas-1" - "-I${e19.efl}/include/ecore-1" - "-I${e19.efl}/include/eina-1" - "-I${e19.efl}/include/eina-1/eina" - "-I${e19.efl}/include/eet-1" - "-I${e19.efl}/include/eo-1" - "-I${e19.efl}/include/ecore-evas-1" - "-I${e19.efl}/include/ecore-imf-1" - "-I${e19.efl}/include/ecore-con-1" - "-I${e19.efl}/include/ecore-file-1" - "-I${e19.efl}/include/ecore-input-1" - "-I${e19.efl}/include/eldbus-1" - "-I${e19.efl}/include/efreet-1" - "-I${e19.efl}/include/ethumb-client-1" - "-I${e19.efl}/include/ethumb-1" ]; GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -39,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Video + Audio player along the lines of mplayer"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix index 96028311f1e8..32135bbe2e2c 100644 --- a/pkgs/desktops/e19/terminology.nix +++ b/pkgs/desktops/e19/terminology.nix @@ -7,17 +7,10 @@ stdenv.mkDerivation rec { sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628"; }; buildInputs = [ pkgconfig e19.efl e19.elementary ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/elocation-1 $NIX_CFLAGS_COMPILE" - ''; meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3109b95d35b6..b33448fa9442 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14964,21 +14964,21 @@ let }; }; - pythonefl_1_13 = buildPythonPackage rec { + pythonefl_1_14 = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.13.0"; + version = "1.14.0"; src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.bz2"; - sha256 = "0yy4v0f04dgdz21wd2c09x9w6lzsbq6g12s8895laln44l5aqd82"; + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; + sha256 = "1pns5mdyc069z6j1pywjasdd6v9xka5kjdl2yxpd6ds948dia0q0"; }; preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" ''; buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; meta = { description = "Python bindings for EFL and Elementary"; homepage = http://enlightenment.org/; - maintainers = with maintainers; [ matejc tstrobel ]; + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = platforms.linux; license = licenses.gpl3; }; From 4de17c78370e5e66204b78bd4e2b12aefc8c9ed2 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Wed, 27 May 2015 19:57:57 +0100 Subject: [PATCH 004/127] Update mediainfo{-gui} and dependencies * mediainfo{-gui} 0.7.73 -> 0.7.74 * libmediainfo 0.7.73 -> 0.7.74 From the mediainfo ChangeLog: ``` Version 0.7.74, 2015-05-25 + FIMS: Preliminary version (not for production) + D-10 audio: display of real bitrate beside the encoded bitrate + VC-3: detection of CDP packets (608/708 captions), created by Nexio, inside the VC-3 private data + AES3: generic term AES3 replaced by more precise SMPTE ST numbers (302, 331, 337) + NUT: basic detection + FFV1: more parsing of the bitstream, support of any version of FFV1 in MOV and Matroska + DPX: color space and frame rate x #B906, Matroska: duration was missing if Info block is at the end of the file x #B908, AC-3: bit depth removed x #P86, MPEG-4: moov_trak_edts_elst Atom was ignoring version of the atom x Dolby E: the MXF channel count value was sometimes reported instead of the real channel count x VorbisComment: WAVEFORMATEXTENSIBLE_CHANNEL_MASK "0X" ("x" in uppercase) is accepted now x EBUCore: TotalProgrammeDuration was wrongly filled with IdentClockStart value x EBUCore: Source/Material moved from timecodeStart to timecodeTrack x MPEG-4: info is missing for some streams in some specific cases ``` --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index ac128b2460ed..1055b4de72b6 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.73"; + version = "0.7.74"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; - sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7"; + sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index ce2875656b6b..6330d90c1780 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.73"; + version = "0.7.74"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; - sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7"; + sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 54862e0482bf..947cee94bd90 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.73"; + version = "0.7.74"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2"; - sha256 = "1c7yc9m4fdrfdlb80g6157sa8s0wlv892pixrfdzfljsqayxnl6k"; + sha256 = "1dn7zwqkl08vafc979i1mx63r2jlr95gfazg4d2cc9v3pav28zpk"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; From 8e4c91124825a384814c9011b08468455b879a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 27 May 2015 21:10:12 +0200 Subject: [PATCH 005/127] gfortran-darwin: add `cc` attribute to fix evaluation Hopefully the value is reasonable. It's used on two places at least to find libs to link against. --- pkgs/development/compilers/gcc/gfortran-darwin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix index 954b236ff6ff..bd11b1ebc8e2 100644 --- a/pkgs/development/compilers/gcc/gfortran-darwin.nix +++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { --with-mpc=${libmpc} ''; makeFlags = ["CC=clang"]; + passthru.cc = stdenv.cc.cc; meta = with stdenv.lib; { description = "GNU Fortran compiler, part of the GNU Compiler Collection."; homepage = "https://gcc.gnu.org/fortran/"; From 9cb63367dc64b2cae8a84faaf0b297d18845cc44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Wed, 27 May 2015 20:39:17 +0100 Subject: [PATCH 006/127] boot: Update version from 2.0.0-rc14 to 2.0.0. --- pkgs/development/tools/build-managers/boot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 6ae4da408c0e..d4fddbb1791a 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { - version = "2.0.0-rc14"; + version = "2.0.0"; name = "boot-${version}"; src = fetchurl { From 6eb8ff878da4a5d99d6c4881a65d7f3e94076fe0 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Wed, 27 May 2015 12:40:44 -0700 Subject: [PATCH 007/127] added cmake flag to prevent autodetection of SDK directory --- .../libraries/science/math/liblapack/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 9f4f43311a47..25667e11264a 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -3,6 +3,7 @@ let atlasMaybeShared = atlas.override { inherit shared; }; usedLibExtension = if shared then ".so" else ".a"; version = "3.4.1"; + inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "liblapack-${version}"; @@ -21,7 +22,10 @@ stdenv.mkDerivation rec { "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" "-DCMAKE_Fortran_FLAGS=-fPIC" ] - ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON") + ++ (optional shared "-DBUILD_SHARED_LIBS=ON") + # If we're on darwin, CMake will automatically detect impure paths. This switch + # prevents that. + ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''") ; doCheck = ! shared; From 87fd373aac3a1aaa84ddb328d43074aeebc1b133 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2015 21:24:01 +0200 Subject: [PATCH 008/127] lib/licenses: add CC-BY-SA-2.5 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 4ac155a9bed4..2b259c680694 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -85,6 +85,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Creative Commons Zero v1.0 Universal"; }; + cc-by-sa-25 = spdx { + spdxId = "CC-BY-SA-2.5"; + fullName = "Creative Commons Attribution Share Alike 2.5"; + }; + cc-by-30 = spdx { spdxId = "CC-BY-3.0"; fullName = "Creative Commons Attribution 3.0"; From b2d7f4b1ba937951fefdd026314512ab0be91508 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2015 21:56:04 +0200 Subject: [PATCH 009/127] Use common licence attributes from lib/licenses.nix Many (less easily automatically converted) old-style strings remain. Where there was any possible ambiguity about the exact version or variant intended, nothing was changed. IANAL, nor a search robot. Use `with stdenv.lib` wherever it makes sense. --- pkgs/applications/audio/beast/default.nix | 4 +- .../editors/emacs-modes/jabber/default.nix | 8 ++-- .../editors/emacs-modes/nyan-mode/default.nix | 6 +-- .../graphics/gimp/plugins/default.nix | 4 +- pkgs/applications/misc/eaglemode/default.nix | 8 ++-- .../networking/browsers/conkeror/default.nix | 8 ++-- .../mozilla-plugins/fribid/default.nix | 8 ++-- .../mplayerplug-in/default.nix | 4 +- .../networking/browsers/netsurf/netsurf.nix | 11 +++-- .../science/electronics/ngspice/default.nix | 8 ++-- .../science/math/pari/default.nix | 8 ++-- .../science/math/speedcrunch/default.nix | 4 +- .../molecular-dynamics/gromacs/default.nix | 4 +- pkgs/applications/video/dvdauthor/default.nix | 4 +- .../window-managers/awesome/default.nix | 2 +- .../window-managers/tabbed/default.nix | 8 ++-- .../window-managers/vwm/default.nix | 8 ++-- .../window-managers/wmii/default.nix | 2 +- .../window-managers/wmii31/default.nix | 2 +- pkgs/data/fonts/powerline-fonts/default.nix | 2 +- pkgs/data/fonts/terminus-font/default.nix | 8 ++-- pkgs/development/compilers/haxe/default.nix | 8 ++-- pkgs/development/compilers/ocaml/3.11.2.nix | 9 ++-- pkgs/development/compilers/ocaml/3.12.1.nix | 9 ++-- pkgs/development/compilers/ocaml/4.00.1.nix | 9 ++-- pkgs/development/compilers/ocaml/4.01.0.nix | 9 ++-- pkgs/development/compilers/ocaml/4.02.1.nix | 9 ++-- .../compilers/ocaml/ber-metaocaml-003.nix | 13 ++++-- .../haskell-modules/hackage-packages.nix | 6 +-- .../interpreters/ruby/ruby-1.9.3.nix | 8 ++-- .../libraries/boost-process/default.nix | 2 +- pkgs/development/libraries/cairo/default.nix | 6 +-- .../development/libraries/cairomm/default.nix | 4 +- pkgs/development/libraries/hwloc/default.nix | 6 +-- .../libraries/java/rhino/default.nix | 4 +- .../libraries/libpseudo/default.nix | 6 +-- .../libraries/libviper/default.nix | 4 +- .../libraries/libvterm/default.nix | 8 ++-- .../libraries/pkcs11helper/default.nix | 4 +- .../libraries/quesoglc/default.nix | 8 ++-- .../rabbitmq-java-client/default.nix | 2 +- .../science/math/liblapack/3.5.0.nix | 8 ++-- .../science/math/liblapack/default.nix | 8 ++-- .../development/libraries/zziplib/default.nix | 4 +- .../ocaml-modules/menhir/default.nix | 11 ++--- .../python-modules/blivet/default.nix | 6 +-- .../tools/misc/autogen/default.nix | 4 +- .../tools/sauce-connect/default.nix | 2 +- pkgs/games/0ad/default.nix | 7 +++- pkgs/games/alienarena/default.nix | 8 ++-- pkgs/games/gsb/default.nix | 6 +-- pkgs/games/tremulous/default.nix | 11 +++-- pkgs/games/urbanterror/default.nix | 8 ++-- pkgs/games/vessel/default.nix | 6 +-- pkgs/games/warsow/default.nix | 8 ++-- pkgs/games/worldofgoo/default.nix | 6 +-- pkgs/os-specific/linux/hal-flash/default.nix | 2 +- pkgs/servers/dico/default.nix | 2 +- pkgs/tools/backup/bacula/default.nix | 4 +- pkgs/tools/compression/xz/default.nix | 8 ++-- pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 6 +-- pkgs/tools/filesystems/s3fs/default.nix | 4 +- pkgs/tools/networking/isync/default.nix | 8 ++-- pkgs/tools/networking/maildrop/default.nix | 4 +- pkgs/tools/networking/mailutils/default.nix | 9 ++-- .../networking/nss-pam-ldapd/default.nix | 4 +- pkgs/tools/networking/wicd/default.nix | 6 +-- pkgs/tools/system/bootchart/default.nix | 4 +- pkgs/tools/system/dog/default.nix | 10 ++--- pkgs/tools/system/tm/default.nix | 8 ++-- pkgs/tools/system/ts/default.nix | 8 ++-- pkgs/top-level/perl-packages.nix | 42 +++++++++---------- pkgs/top-level/python-packages.nix | 16 +++---- 73 files changed, 269 insertions(+), 234 deletions(-) diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 340a83e7963f..3997855a75b6 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation { ./patch.patch # patches taken from gentoo ]; - meta = { + meta = with stdenv.lib; { description = "A music composition and modular synthesis application"; homepage = http://beast.gtk.org; - license = ["GPL-2" "LGPL-2.1"]; + license = with licenses; [ gpl2 lgpl21 ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix index 82028722f54c..cb8a22a3c06f 100644 --- a/pkgs/applications/editors/emacs-modes/jabber/default.nix +++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26"; }; buildInputs = [ emacs ]; - meta = { + meta = with stdenv.lib; { description = "A Jabber client for Emacs"; longDescription = '' jabber.el is a Jabber client for Emacs. It may seem strange to have a @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { a special case of text editing. ''; homepage = http://emacs-jabber.sourceforge.net/; - license = [ "GPLv2+" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; gpl2Plus; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix index ab94dbae9501..a21c73b7e8b0 100644 --- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix @@ -1,4 +1,4 @@ -{trivialBuild, fetchFromGitHub}: +{trivialBuild, lib, fetchFromGitHub}: trivialBuild rec { pname = "nyan-mode"; @@ -23,9 +23,9 @@ trivialBuild rec { cp -r mus $out ''; - meta = { + meta = with lib; { description = "An analog indicator of the position in the buffer"; homepage = https://github.com/TeMPOraL/nyan-mode/; - license = "GPLv3+"; + license = with licenses; gpl3Plus; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 5f43abfcfc1e..8ece9ba2453c 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -59,12 +59,12 @@ rec { sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure ''; - meta = { + meta = with stdenv.lib; { description = "The GIMP Animation Package"; homepage = http://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license # falls inside "free". - license = [ "GPLv3" "free" ]; + license = with licenses; [ gpl3 free ]; }; }; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index db613cd49222..47535ab6b903 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { ln -s $out/eaglemode.sh $out/bin/eaglemode.sh ''; - meta = { + meta = with stdenv.lib; { homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; - license="GPLv3"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; gpl3; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index f6e3cd3cf8d1..9715b46ed507 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { --add-flags "-app $out/libexec/conkeror/application.ini" ''; - meta = { + meta = with stdenv.lib; { description = "A keyboard-oriented, customizable, extensible web browser"; longDescription = '' Conkeror is a keyboard-oriented, highly-customizable, highly-extensible @@ -30,8 +30,8 @@ stdenv.mkDerivation { self-documenting, featuring a powerful interactive help system. ''; homepage = http://conkeror.org/; - license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl chaoflow ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ mpl11 gpl2 lgpl21 ]; + maintainers = with maintainers; [ astsmtl chaoflow ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 3b473019600f..b8aa17803e9f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { passthru.mozillaPlugin = "/lib/mozilla/plugins"; - meta = { + meta = with stdenv.lib; { description = "A browser plugin to manage Swedish BankID:s"; longDescription = '' FriBID is an open source software for the Swedish e-id system @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { support. ''; homepage = http://fribid.se; - license = [ "GPLv2" "MPLv1" ]; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ gpl2 mpl10 ]; + maintainers = [ maintainers.edwtjo ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 105e5904715c..07e152e91dbc 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { mozillaPlugin = "/lib/mozilla/plugins"; }; - meta = { + meta = with stdenv.lib; { description = "A browser plugin that uses mplayer to play digital media from websites"; homepage = http://mplayerplug-in.sourceforge.net/; - license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; + license = with licenses; [ gpl2Plus lgpl2Plus "MPLv1+" ]; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/netsurf.nix b/pkgs/applications/networking/browsers/netsurf/netsurf.nix index 2d2253f43ef1..f7e90b61a941 100644 --- a/pkgs/applications/networking/browsers/netsurf/netsurf.nix +++ b/pkgs/applications/networking/browsers/netsurf/netsurf.nix @@ -23,12 +23,15 @@ stdenv.mkDerivation { buildPhase = "make PREFIX=$out"; installPhase = "make PREFIX=$out install"; - meta = { + meta = with args.lib; { description = "free, open source web browser"; homepage = http://www.netsurf-browser.org; - license = ["GPLv2" /* visual worrk : */ "MIT" ]; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + license = with licenses; [ + gpl2 + mit /* visual work */ + ]; + maintainers = with maintainers; [ marcweber ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 493af97d1567..e64ea909cbb9 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation { configureFlags = [ "--enable-x" "--with-x" "--with-readline" ]; - meta = { + meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = "http://ngspice.sourceforge.net"; - license = ["BSD" "GPLv2"]; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ "BSD" gpl2 ]; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 0dbab841a81b..b97314f02d1d 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { "--with-gmp=${gmp} " + "--with-readline=${readline}"; - meta = { + meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; homepage = "http://pari.math.u-bordeaux.fr/"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [ertes raskin]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; gpl2Plus; + maintainers = with maintainers; [ ertes raskin ]; + platforms = platforms.linux; inherit version; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index dee33a04be22..e2f34d48de27 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { buildFlags = "VERBOSE=1"; - meta = { + meta = with stdenv.lib; { homepage = "http://speedcrunch.digitalfanatics.org"; - license = "GPLv2+"; + license = with licenses; gpl2Plus; description = "A fast power user calculator"; longDescription = '' SpeedCrunch is a fast, high precision and powerful desktop calculator. diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 879690bc91ed..bb851140b45d 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation { ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} ''; - meta = { + meta = with stdenv.lib; { homepage = "http://www.gromacs.org"; - license = "GPLv2"; + license = with licenses; gpl2; description = "Molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index cab7b4112d03..03ccb2664fce 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec{ ./dvdauthor-imagemagick-0.7.0.patch ]; - meta = { + meta = with stdenv.lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; - license = ["GPLv2"]; + license = with licenses; gpl2; }; } diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 3541743057cc..a158dd8dcf45 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Highly configurable, dynamic window manager for X"; homepage = http://awesome.naquadah.org/; - license = "GPLv2+"; + license = with licenses; gpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 2dec3b2241f2..82539b940b8c 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { export makeFlags="PREFIX=$out" ''; - meta = { + meta = with stdenv.lib; { homepage = http://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; - license="MIT"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; mit; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 3613bb21ff62..be0a946064b6 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ]; - meta = { + meta = with stdenv.lib; { homepage = http://vwm.sourceforge.net/; description = "Dynamic window manager for the console"; - license="GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; gpl2Plus; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix index a44c54f7b575..e8ecc72a6d30 100644 --- a/pkgs/applications/window-managers/wmii/default.nix +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -30,6 +30,6 @@ args: with args; stdenv.mkDerivation { "; meta = { homepage = "www.suckless.org"; description = "a really cool window manager which can by driven by keyboard only"; - license="MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix index dd49cf5ec43e..568be30f1c52 100644 --- a/pkgs/applications/window-managers/wmii31/default.nix +++ b/pkgs/applications/window-managers/wmii31/default.nix @@ -30,6 +30,6 @@ args: with args; stdenv.mkDerivation { "; meta = { homepage = "www.suckless.org"; description = "One small tool of the wmii window manger to let the user select an item from a list by filtering"; - license="MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 2f528a619e72..3ae436179ba1 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { longDescription = '' Pre-patched and adjusted fonts for usage with the Powerline plugin. ''; - license = "asl20 free ofl"; + license = with licenses; [ asl20 free ofl ]; platforms = platforms.all; maintainer = with maintainers; [ malyn ]; }; diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index fa9eb0ac42d5..6dab322b056c 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { make install fontdir ''; - meta = { + meta = with stdenv.lib; { description = "A clean fixed width font"; longDescription = '' Terminus Font is designed for long (8 and more hours per day) work @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { EGA/VGA-bold for 8x14 and 8x16. ''; homepage = http://www.is-vn.bg/hamster/; - license = [ "GPLv2+" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 8e6828bce468..d9c9f91df6a1 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation { dontStrip = true; - meta = { + meta = with stdenv.lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = http://haxe.org; - license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 195e83e7313b..ce61e5621390 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -41,9 +41,12 @@ stdenv.mkDerivation rec { ln -sv $out/lib/ocaml/caml $out/include/caml ''; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -65,7 +68,7 @@ stdenv.mkDerivation rec { documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 6488d94cc08e..e6ed6f4b73ed 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -34,10 +34,13 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; branch = "3.12"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -59,7 +62,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 4e888e143223..f8a7ed920a52 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -33,10 +33,13 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; branch = "4.00"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -58,7 +61,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index d178285834ff..1d323ec0cba6 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -48,10 +48,13 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; branch = "4.01"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -73,7 +76,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/4.02.1.nix b/pkgs/development/compilers/ocaml/4.02.1.nix index 18f9d3736506..6f4cce522e46 100644 --- a/pkgs/development/compilers/ocaml/4.02.1.nix +++ b/pkgs/development/compilers/ocaml/4.02.1.nix @@ -44,10 +44,13 @@ stdenv.mkDerivation rec { nativeCompilers = useNativeCompilers; }; - meta = { + meta = with stdenv.lib; { homepage = http://caml.inria.fr/ocaml; branch = "4.02"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; description = "Most popular variant of the Caml language"; longDescription = @@ -69,7 +72,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 8b86c805c61f..882af287c045 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -55,9 +55,16 @@ stdenv.mkDerivation rec { cd .. ''; - meta = { + meta = with stdenv.lib; { homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; - license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; + description = "Conservative extension of OCaml"; + longDescription = '' + A conservative extension of OCaml with the primitive type of code values, + and three basic multi-stage expression forms: Brackets, Escape, and Run + ''; }; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2f03b30e0ad8..d24e5f44828f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4726,7 +4726,7 @@ self: { sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky"; buildDepends = [ base haskell98 ]; description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562"; - license = "BSD4"; + license = stdenv.lib.licenses.bsdOriginal; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -21072,7 +21072,7 @@ self: { glib Glob gtk gtksourceview2 hint mtl process syb ]; description = "A GTK-based abstract syntax tree viewer for custom languages and parsers"; - license = "BSD4"; + license = stdenv.lib.licenses.bsdOriginal; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -21084,7 +21084,7 @@ self: { sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn"; buildDepends = [ base containers syb ]; description = "Interfacing between hint and astview"; - license = "BSD4"; + license = stdenv.lib.licenses.bsdOriginal; }) {}; "async" = callPackage diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix index db807ebbd8b3..5f6540d3ee29 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix @@ -101,12 +101,12 @@ stdenv.mkDerivation rec { sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig ''; - meta = { - license = "Ruby"; + meta = with stdenv.lib; { + license = with licenses; [ ruby ]; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; }; passthru = rec { diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 974654216e01..86cdd08db64c 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.highscore.de/boost/process0.5/"; description = "Library to manage system processes"; - license = "boost-license"; + license = with licenses; boost; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 89c791fae020..47a2c63d3283 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { '' + glib.flattenInclude ); - meta = { + meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; - license = [ "LGPLv2+" "MPLv1" ]; + license = with licenses; [ lgpl2Plus mpl10 ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 990d44dfef8e..b8e9fd7966b0 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; - meta = { + meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; - license = [ "LGPLv2+" "MPLv1" ]; + license = with licenses; [ lgpl2Plus mpl10 ]; }; } diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index f5a3857ec28a..da658e398eb1 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { # . doCheck = !stdenv.isCygwin; - meta = { + meta = with stdenv.lib; { description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { ''; # http://www.open-mpi.org/projects/hwloc/license.php - license = "revised-BSD"; + license = with licenses; bsd3; homepage = http://www.open-mpi.org/projects/hwloc/; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 34aaded7cb44..74aa8c9ba162 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { cp -v *.jar "$out/share/java" ''; - meta = { + meta = with stdenv.lib; { description = "An implementation of JavaScript written in Java"; longDescription = @@ -52,6 +52,6 @@ stdenv.mkDerivation { homepage = http://www.mozilla.org/rhino/; - license = [ "MPLv1.1" /* or */ "GPLv2+" ]; + license = with licenses; [ mpl11 /* or */ gpl2Plus ]; }; } diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index 29a8c459c34c..8a7054db20a0 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [pkgconfig glib ncurses]; + buildInputs = [ pkgconfig glib ncurses ]; - meta = { + meta = with stdenv.lib; { homepage = http://libpseudo.sourceforge.net/; description = "Simple, thread-safe messaging between threads"; - license="GPLv2+"; + license = with licenses; gpl2Plus; }; } diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index f82581b10977..1dcd578da293 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig glib ncurses gpm]; - meta = { + meta = with stdenv.lib; { homepage = http://libviper.sourceforge.net/; description = "Simple window creation and management facilities for the console"; - license="GPLv2+"; + license = with licenses; gpl2Plus; }; } diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index cc2fd268ae6b..b52db39042f0 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [pkgconfig glib ncurses]; + buildInputs = [ pkgconfig glib ncurses ]; - meta = { + meta = with stdenv.lib; { homepage = http://libvterm.sourceforge.net/; description = "Terminal emulator library to mimic both vt100 and rxvt"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; + license = with licenses; gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 5443df89704d..c4f0ad16fb76 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig openssl autoconf automake libtool ]; - meta = { + meta = with stdenv.lib; { homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; - license = [ "BSD" "GPLv2" ]; + license = with licenses; [ "BSD" gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; }; } diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 3d2f098267d3..928095a4e29b 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ mesa glew freetype fontconfig fribidi libX11 ]; # FIXME: Configure fails to use system glew. - meta = { + meta = with stdenv.lib; { description = "A free implementation of the OpenGL Character Renderer"; longDescription = '' QuesoGLC is a free (as in free speech) implementation of the OpenGL @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { platform that supports both FreeType and the OpenGL API. ''; homepage = http://quesoglc.sourceforge.net/; - license = [ "LGPLv2.1+" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ lgpl21Plus ]; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index 2183aa83e20e..a1708ba59c35 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; homepage = http://www.rabbitmq.com/java-client.html; - license = [ "MPLv1.1" "GPLv2" ]; + license = with licenses; [ mpl11 gpl2 ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix index 0b4badf26e7a..3427bf1c4e98 100644 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation rec { blas = atlas; }; - meta = { + meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - license = "revised-BSD"; + license = with licenses; bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.all; + maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 9f4f43311a47..cbe03b8eb632 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation rec { blas = atlas; }; - meta = { + meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - license = "revised-BSD"; + license = with licenses; bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.all; + maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index dcfaafc2b7d8..1e474e722ffa 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { description = "Library to extract data from files archived in a zip file"; longDescription = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { zip/unzip tools. ''; - license = [ "LGPLv2+" "MPLv1.1" ]; + license = with licenses; [ lgpl2Plus mpl11 ]; homepage = http://zziplib.sourceforge.net/; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index d5db6e9c7e0c..0a73f8aa04a7 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { export PREFIX=$out ''; - meta = { + meta = with stdenv.lib; { homepage = http://pauillac.inria.fr/~fpottier/menhir/; description = "A LR(1) parser generator for OCaml"; longDescription = '' @@ -41,10 +41,11 @@ stdenv.mkDerivation { to OCaml code. Menhir was designed and implemented by François Pottier and Yann Régis-Gianas. ''; - license = [ "QPL" /* generator */ "LGPLv2" /* library */ ]; - platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z + license = with licenses; [ + qpl /* generator */ + lgpl2 /* library */ ]; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ z77z ]; }; } diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index f84c836c056f..3065af0fd15f 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -39,10 +39,10 @@ in buildPythonPackage rec { # Tests are in . doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; - license = [ "GPLv2+" "LGPLv2.1+" ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 48533f553fe4..01c5fd7dcbad 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -24,7 +24,7 @@ let version = "5.18"; in #doCheck = true; # 2 tests fail because of missing /dev/tty - meta = { + meta = with stdenv.lib; { description = "Automated text and program generation tool"; longDescription = '' @@ -46,7 +46,7 @@ let version = "5.18"; in documentation of program options. ''; - license = ["GPLv3+" "LGPLv3+" ]; + license = with licenses; [ gpl3Plus lgpl3Plus ]; homepage = http://www.gnu.org/software/autogen/; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index e41b45dff68f..99e54e86a56e 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A secure tunneling app for executing tests securely when testing behind firewalls"; - license = "unfree"; + license = with licenses; unfree; homepage = https://docs.saucelabs.com/reference/sauce-connect/; maintainers = with maintainers; [offline]; platforms = with platforms; platforms.linux; diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index bbcc6f11d1dc..5a0bdcd70a7e 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -112,10 +112,13 @@ stdenv.mkDerivation rec { done "$out"/share/applications/0ad.desktop ''; - meta = { + meta = with stdenv.lib; { description = "A free, open-source game of ancient warfare"; homepage = "http://wildfiregames.com/0ad/"; - license = [ "GPLv2" "LGPLv2.1" "MIT" "CC BY-SA 3.0" "zlib" ]; + license = with licenses; [ + gpl2 lgpl21 mit cc-by-sa-30 + licenses.zlib # otherwise masked by pkgs.zlib + ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index b3c2dd14718e..485b52d3d088 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace libGL.so.1 ${mesa}/lib/libGL.so.1 ''; - meta = { + meta = with stdenv.lib; { description = "A free, stand-alone first-person shooter computer game"; longDescription = '' Do you like old school deathmatch with modern features? How @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { ''; homepage = http://red.planetarena.org; # Engine is under GPLv2, everything else is under - license = [ "unfree-redistributable" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; unfreeRedistributable; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix index 642a86ac4de2..a0a25a2ff4b4 100644 --- a/pkgs/games/gsb/default.nix +++ b/pkgs/games/gsb/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/GSB ''; - meta = { + meta = with stdenv.lib; { description = "Gratuitous Space Battles"; longDescription = '' a strategy / management / simulation game that does away with all the @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { battle (or at least blow to bits in aesthetically pleasing ways). ''; homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html; - license = [ "unfree" ]; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = with licenses; unfree; + maintainers = with maintainers; [ jcumming ]; platforms = [ "x86_64-linux" "i686-linux" ] ; }; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index 3fcbff42527f..fd80eecfd55c 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { done ''; dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "A game that blends a team based FPS with elements of an RTS"; longDescription = '' Tremulous is a free, open source game that blends a team based FPS with @@ -70,9 +70,12 @@ stdenv.mkDerivation rec { degree), healing functions and much more... ''; homepage = http://www.tremulous.net; - license = [ "GPLv2" ]; # media under cc by-sa 2.5 - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ + gpl2 + cc-by-sa-25 /* media */ + ]; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; broken = true; }; } diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 6b4c6e68bacc..925362be1c58 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { cur_rpath=$(patchelf --print-rpath $p) patchelf --set-rpath $cur_rpath:${mesa}/lib $p ''; - meta = { + meta = with stdenv.lib; { description = "A multiplayer tactical FPS on top of Quake 3 engine"; longDescription = '' Urban Terror is a free multiplayer first person shooter developed by @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { realism". This results in a very unique, enjoyable and addictive game. ''; homepage = http://www.urbanterror.net; - license = [ "unfree-redistributable" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; unfreeRedistributable; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index cab6a269f93a..4a845a3a17e1 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/Vessel ''; - meta = { + meta = with stdenv.lib; { description = "A fluid physics based puzzle game"; longDescription = '' Living liquid machines have overrun this world of unstoppable progress, @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { to life, and all the consequences that ensue. ''; homepage = http://www.strangeloopgames.com; - license = [ "unfree" ]; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = with licenses; unfree; + maintainers = with maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 84d15efb810f..83c9b5d52fa5 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { cur_rpath=$(patchelf --print-rpath $p) patchelf --set-rpath $cur_rpath:${mesa}/lib $p ''; - meta = { + meta = with stdenv.lib; { description = "Multiplayer FPS game designed for competitive gaming"; longDescription = '' Set in a futuristic cartoon-like world where rocketlauncher-wielding @@ -56,8 +56,8 @@ stdenv.mkDerivation rec { ''; homepage = http://www.warsow.net; # Engine is under GPLv2, everything else is under - license = [ "unfree-redistributable" ]; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; unfreeRedistributable; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 8df3ef1e8403..2382da034534 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/WorldofGoo ''; - meta = { + meta = with stdenv.lib; { description = "A physics based puzzle game"; longDescription = '' World of Goo is a physics based puzzle / construction game. The millions of Goo @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { game, or that they are extremely delicious. ''; homepage = http://worldofgoo.com; - license = [ "unfree" ]; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = with licenses; unfree; + maintainers = with maintainers; [ jcumming ]; }; } diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index f61318e1b6bb..c385971104dd 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { package. Provides the minimum necessary functionality to enable libflashplayer.so/libadobecp.so to play back DRM content. ''; - license = "afl21 gpl2"; + license = with licenses; [ afl21 gpl2 ]; maintainers = with maintainers; [ malyn ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index f345fe71a34f..ebabb1091eea 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flexible dictionary server and client implementing RFC 2229"; homepage = http://www.gnu.org/software/dico/; - license = "GPLv3+"; + license = with licenses; gpl3Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 4882097c91a7..fdc52eabd4b5 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Enterprise ready, Network Backup Tool"; homepage = http://bacula.org/; - license = "GPLv2"; + license = with licenses; gpl2; maintainers = with maintainers; [ iElectric lovek323 ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 69c14023701b..6a9d4582dff2 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/doc"; - meta = { + meta = with stdenv.lib; { homepage = http://tukaani.org/xz/; description = "XZ, general-purpose data compression software, successor of LZMA"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { bzip2. ''; - license = [ "GPLv2+" "LGPLv2.1+" ]; - maintainers = with stdenv.lib.maintainers; [ sander ]; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ sander ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 44333b519cbe..fd7d59774b26 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -45,10 +45,10 @@ buildPythonPackage rec { # tests are currently _heavily_ broken upstream doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; - license = [ "GPLv2+" "LGPLv2.1+" ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index c39f5cba775b..f081f8121699 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ]; - meta = { + meta = with stdenv.lib; { description = "Mount an S3 bucket as filesystem through FUSE"; - license = "GPLv2"; + license = with licenses; gpl2; }; } diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 47efe53c0a97..f16698ef3cd9 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl pkgconfig db cyrus_sasl ]; - meta = { + meta = with stdenv.lib; { homepage = http://isync.sourceforge.net/; description = "Free IMAP and MailDir mailbox synchronizer"; - license = [ "GPLv2+" ]; + license = with licenses; [ gpl2Plus ]; - maintainers = with stdenv.lib.maintainers; [ the-kenny viric ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ the-kenny viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index 991d75c66ae4..cf9c3a4fa4e0 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot - meta = { + meta = with stdenv.lib; { homepage = http://www.courier-mta.org/maildrop/; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; - license = [ "GPLv3" ]; + license = with licenses; gpl3; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 0b57a752a375..cbca408f0842 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Tests fail since gcc 4.8 doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Rich and powerful protocol-independent mail framework"; longDescription = '' @@ -46,13 +46,16 @@ stdenv.mkDerivation rec { message handling system. ''; - license = [ "LGPLv3+" /* libraries */ "GPLv3+" /* tools */ ]; + license = with licenses; [ + lgpl3Plus /* libraries */ + gpl3Plus /* tools */ + ]; maintainers = [ ]; homepage = http://www.gnu.org/software/mailutils/; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = stdenv.lib.platforms.gnu; + platforms = platforms.gnu; }; } diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index a63ec2a3d680..2368470b84d7 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { wrapProgram $out/sbin/nslcd --prefix LD_LIBRARY_PATH ":" $out/lib ''; - meta = { + meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; homepage = http://arthurdejong.org/nss-pam-ldapd/; - license = [ "GPLv21" ]; + license = with licenses; [ lgpl21 ]; }; } diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 55a99dd2729a..7f6addc86294 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { echo "wpa2-ttls" >> "$out/etc/encryption/templates/active" ''; - meta = { + meta = with stdenv.lib; { homepage = http://wicd.net/; description = "A wiredless and wired network manager"; longDescription='' @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { encryption types, such as WPA and WEP. Wicd will automatically connect at startup to any preferred network within range. ''; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - license="GPLv2"; + maintainers = [ maintainers.roconnor ]; + license = with licenses; gpl2; }; } diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index bb3f9d72e828..1e2f74e1b0a2 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { chmod +x $out/sbin/bootchartd ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.bootchart.org/; description = "Performance analysis and visualization of the GNU/Linux boot process"; - license="GPLv2+"; + license = with licenses; gpl2Plus; }; } diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index 9c98da6ac85b..fd911142c219 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { cp dog $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = "http://lwn.net/Articles/421072/"; - description = "a cat replacement"; - license="GPLv2+"; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; all; + description = "cat replacement"; + license = with licenses; gpl2Plus; + maintainers = with maintainers; [ qknight ]; + platforms = with platforms; all; }; } diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 0a4c1e58fc54..a1397cb6214f 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation { sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; }; - meta = { + meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; description = "terminal mixer - multiplexer for the i/o of terminal applications"; - license="GPLv2"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = with licenses; gpl2; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; all; }; } diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 6d1c6ad5e1ff..6cd69a746f0e 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { sha256 = "042r9a09300v4fdrw4r60g5xi25v5m6g12kvvr6pcsm9qnfqyqqs"; }; - meta = { + meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; description = "task spooler - batch queue"; - license="GPLv2"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = with licenses; gpl2; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; all; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 56bffa0bc51b..e6556b0898ae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -33,12 +33,12 @@ let self = _self // overrides; _self = with self; { # use gnused so that the preCheck command passes buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ]; propagatedBuildInputs = [ FileNext ]; - meta = { + meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; homepage = http://betterthangrep.com/; - license = "free"; # Artistic 2.0 + license = with licenses; artistic2; maintainers = with maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; # tests fails on nixos and hydra because of different purity issues doCheck = false; @@ -3721,9 +3721,9 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ListMoreUtils ModulePluggable Moose MooseXParamsValidate MooseXSemiAffordanceAccessor namespaceautoclean ] ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; - meta = { + meta = with stdenv.lib; { description = "Watch for changes to files, cross-platform style"; - license = "artistic_2"; + license = with licenses; artistic2; }; }; @@ -3983,10 +3983,10 @@ let self = _self // overrides; _self = with self; { sha256 = "0mxfhi1ndckj4w7fw20rwy6ymalg2yncnp9xn0v2bnk5ibqj439w"; }; propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ]; - meta = { + meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; - license = "gpl"; + license = with licenses; gpl2; }; }; @@ -4158,9 +4158,9 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.graphviz ]; propagatedBuildInputs = [ IPCRun TestMore ]; - meta = { + meta = with stdenv.lib; { description = "Perl interface to the GraphViz graphing tool"; - license = [ "Artistic" ]; + license = with licenses; artistic2; maintainers = [ ]; }; }; @@ -4861,7 +4861,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c"; }; - meta = { + meta = with stdenv.lib; { description = "ExifTool, a tool to read, write and edit EXIF meta information"; homepage = http://www.sno.phy.queensu.ca/~phil/exiftool/; @@ -4877,10 +4877,10 @@ let self = _self // overrides; _self = with self; { Sigma/Foveon and Sony. ''; - license = [ "GPLv1+" /* or */ "Artistic" ]; + license = with licenses; [ gpl1Plus /* or */ artistic2 ]; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; }; @@ -7810,10 +7810,10 @@ let self = _self // overrides; _self = with self; { sha256 = "c5da0e390b58655934e1df57937d29d7de13b99f5638fe44833832a5b39c8aa5"; }; propagatedBuildInputs = [ FileFindIterator IPCRun constantdefer libintlperl ]; - meta = { + meta = with stdenv.lib; { homepage = http://user42.tuxfamily.org/podlinkcheck/index.html; description = "Check POD L<> link references"; - license = "gpl"; + license = with licenses; gpl3Plus; }; }; @@ -7921,9 +7921,9 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2013031301.tar.gz; sha256 = "729a8198d264aa64ecbb233ff990507f97fbb66bda746b95f3286f50f5f25c84"; }; - meta = { + meta = with stdenv.lib; { description = "Provide commonly requested regular expressions"; - license = "mit"; + license = with licenses; mit; }; }; @@ -8433,9 +8433,9 @@ let self = _self // overrides; _self = with self; { sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; }; propagatedBuildInputs = [ ParamsUtil SubExporter ]; - meta = { + meta = with stdenv.lib; { description = "Build sprintf-like functions of your own"; - license = "gpl"; + license = with licenses; gpl2; }; }; @@ -9333,11 +9333,11 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ ClassInspector TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase FatalException Moose namespaceclean TestAssert ]; - meta = { + meta = with stdenv.lib; { description = "Simulating other classes"; - license = "lgpl"; + license = with licenses; lgpl2Plus; maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b33448fa9442..7d6678974e03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7437,12 +7437,12 @@ let meta = { homepage = http://namebench.googlecode.com/; description = "Find fastest DNS servers available"; - license = [ - "Apache-2.0" + license = with licenses; [ + asl20 # third-party program licenses (embedded in the sources) "LGPL" # Crystal_Clear - "free" # dns - "Apache-2.0" # graphy + free # dns + asl20 # graphy "BSD" # jinja2 ]; longDescription = '' @@ -8058,7 +8058,7 @@ let not a large parsing framework or a component of some larger system. ''; - license = "revised-BSD"; + license = with licenses; bsd3; maintainers = [ ]; }; @@ -10164,7 +10164,7 @@ let meta = { homepage = "https://github.com/rackspace/pyrax"; - license = "MIT"; + license = with licenses; mit; description = "Python API to interface with Rackspace"; }; @@ -10240,7 +10240,7 @@ let meta = { homepage = "http://github.com/mongodb/mongo-python-driver"; - license = [ "Apache-2.0" ]; + license = with licenses; [ asl20 ]; description = "Python driver for MongoDB "; }; }; @@ -10308,7 +10308,7 @@ let in Python. ''; - license = "revised BSD"; + license = with licenses; bsd3; maintainers = [ ]; }; From 201059f728f93be48d1043d45ca5c51bd87d5407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 27 May 2015 22:49:57 +0200 Subject: [PATCH 010/127] python-pyev: new package Python bindings for the libev library. https://code.google.com/p/pyev/ --- pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d6678974e03..bc6b79a86e4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9354,6 +9354,32 @@ let }; }; + + pyev = buildPythonPackage rec { + name = "pyev-0.9.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyev/${name}.tar.gz"; + sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; + }; + + buildInputs = [ pkgs.libev ]; + + postPatch = '' + libev_so=${pkgs.libev}/lib/libev.so.4 + test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; } + sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py + ''; + + meta = { + description = "Python bindings for libev"; + homepage = https://code.google.com/p/pyev/; + license = licenses.gpl3; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + pyfeed = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; From 4793f2c7d3a521310c128b8afb11750455022bf9 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 26 May 2015 10:58:16 -0500 Subject: [PATCH 011/127] nixpkgs: arcanist 20150412 -> 20150525 Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 309d20d675b6..dfa83ffb3127 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/phacility/libphutil.git"; - rev = "efc338d50f17dec594a66337034797c90c8b10c1"; - sha256 = "9a9df8667d9bf31667facd1cd873adef292c63893adc15d32bd819c47256027c"; + rev = "672c0f7d5da9be6cda619428a9da3b91a670ea2f"; + sha256 = "830c7abce7244afa188255a6f288c345004cc4be1c8bbe93afa2aa2f1768f025"; }; arcanist = fetchgit { url = "git://github.com/phacility/arcanist.git"; - rev = "e101496508e279e1b9ee15d7d549735a0352f8ab"; - sha256 = "4f2ae195173d859f9920378c42e257d70e5720b7f54c02d9af2c398f936f20b9"; + rev = "64d03ff68bf2ff4ef99186472704df8aface9ef3"; + sha256 = "e9c5f9a9dcb1be0b7fd6f5fbda865e14277ddb0c1cedd256c459b3540ec6ded7"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20150412"; + version = "20150525"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; From 6fbc62419b70ef7a0336bd65c89227db2aec0f5b Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 13 May 2015 06:52:56 -0500 Subject: [PATCH 012/127] nixpkgs: afl 1.67b -> 1.80b Signed-off-by: Austin Seipp --- pkgs/tools/security/afl/default.nix | 15 +++++---------- pkgs/tools/security/afl/qemu-patches/afl-config.h | 9 +++++---- .../security/afl/qemu-patches/cpu-exec.patch | 14 +++++++------- .../tools/security/afl/qemu-patches/elfload.patch | 8 ++++---- .../tools/security/afl/qemu-patches/syscall.patch | 4 ++-- .../security/afl/qemu-patches/translate-all.patch | 6 +++--- pkgs/tools/security/afl/qemu.nix | 4 ++-- 7 files changed, 28 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index ea495145d1ac..2aed8df32605 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.67b"; + version = "1.80b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "11763zgwqg2b5hak006rp0jb3w252js067z9ibgl4nj3br2ncmd2"; + sha256 = "008l2qirwlf40yhlrybcpglsil9nw8498qcjmvrnvvq31piwyhp0"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { buildPhase = '' make PREFIX=$out - cd llvm_mode && make && cd .. + cd llvm_mode + make PREFIX=$out CC=${clang}/bin/clang CXX=${clang}/bin/clang++ + cd .. ''; installPhase = '' # Do the normal installation @@ -42,13 +44,6 @@ stdenv.mkDerivation rec { # Patch shebangs before wrapping patchShebangs $out/bin - # Wrap every program with a custom $AFL_PATH; I believe there is a - # bug in afl which causes it to fail to find `afl-qemu-trace` - # relative to `afl-fuzz` or `afl-showmap`, so we instead set - # $AFL_PATH as a workaround, which allows it to be found. - for x in `ls $out/bin/afl-* | grep -v afl-clang-fast`; do - wrapProgram $x --prefix AFL_PATH : "$out/bin" - done # Wrap afl-clang-fast(++) with a *different* AFL_PATH, because it # has totally different semantics in that case(?) - and also set a # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out diff --git a/pkgs/tools/security/afl/qemu-patches/afl-config.h b/pkgs/tools/security/afl/qemu-patches/afl-config.h index 0017f9d83f4b..cbf48881ade2 100644 --- a/pkgs/tools/security/afl/qemu-patches/afl-config.h +++ b/pkgs/tools/security/afl/qemu-patches/afl-config.h @@ -88,10 +88,10 @@ /* Maximum stacking for havoc-stage tweaks. The actual value is calculated like this: - n = random between 0 and HAVOC_STACK_POW2 + n = random between 1 and HAVOC_STACK_POW2 stacking = 2^n - In other words, the default (n = 7) produces 1, 2, 4, 8, 16, 32, 64, or + In other words, the default (n = 7) produces 2, 4, 8, 16, 32, 64, or 128 stacked tweaks: */ #define HAVOC_STACK_POW2 7 @@ -250,9 +250,10 @@ #define RESEED_RNG 10000 -/* Maximum line length passed from GCC to 'as': */ +/* Maximum line length passed from GCC to 'as' and used for parsing + configuration files: */ -#define MAX_AS_LINE 8192 +#define MAX_LINE 8192 /* Environment variable used to pass SHM ID to the called program. */ diff --git a/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch index 29b65e71b9ad..75a7ea450eff 100644 --- a/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch +++ b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch @@ -1,15 +1,15 @@ ---- qemu-2.2.0/cpu-exec.c.orig 2014-12-09 14:45:40.000000000 +0000 -+++ qemu-2.2.0/cpu-exec.c 2015-02-20 22:07:02.966000000 +0000 -@@ -25,6 +25,8 @@ - #include "sysemu/qtest.h" - #include "qemu/timer.h" +--- qemu-2.3.0/cpu-exec.c.orig 2014-12-09 14:45:40.000000000 +0000 ++++ qemu-2.3.0/cpu-exec.c 2015-02-20 22:07:02.966000000 +0000 +@@ -28,6 +28,8 @@ + #include "exec/memory-internal.h" + #include "qemu/rcu.h" +#include "afl-qemu-cpu-inl.h" + /* -icount align implementation. */ typedef struct SyncClocks { -@@ -262,8 +264,11 @@ +@@ -296,8 +298,11 @@ } not_found: /* if no translated code available, then translate it now */ @@ -21,7 +21,7 @@ found: /* Move the last found TB to the head of the list */ if (likely(*ptb1)) { -@@ -455,6 +460,9 @@ +@@ -492,6 +497,9 @@ next_tb = 0; tcg_ctx.tb_ctx.tb_invalidated_flag = 0; } diff --git a/pkgs/tools/security/afl/qemu-patches/elfload.patch b/pkgs/tools/security/afl/qemu-patches/elfload.patch index 65f1572e9a7b..325c917d15a3 100644 --- a/pkgs/tools/security/afl/qemu-patches/elfload.patch +++ b/pkgs/tools/security/afl/qemu-patches/elfload.patch @@ -1,5 +1,5 @@ ---- qemu-2.2.0/linux-user/elfload.c.orig 2014-12-09 14:45:42.000000000 +0000 -+++ qemu-2.2.0/linux-user/elfload.c 2015-01-28 02:51:23.719000000 +0000 +--- qemu-2.3.0/linux-user/elfload.c.orig 2014-12-09 14:45:42.000000000 +0000 ++++ qemu-2.3.0/linux-user/elfload.c 2015-01-28 02:51:23.719000000 +0000 @@ -28,6 +28,8 @@ #define ELF_OSABI ELFOSABI_SYSV @@ -9,7 +9,7 @@ /* from personality.h */ /* -@@ -1886,6 +1888,8 @@ +@@ -1889,6 +1891,8 @@ info->brk = 0; info->elf_flags = ehdr->e_flags; @@ -18,7 +18,7 @@ for (i = 0; i < ehdr->e_phnum; i++) { struct elf_phdr *eppnt = phdr + i; if (eppnt->p_type == PT_LOAD) { -@@ -1919,9 +1923,11 @@ +@@ -1922,9 +1926,11 @@ if (elf_prot & PROT_EXEC) { if (vaddr < info->start_code) { info->start_code = vaddr; diff --git a/pkgs/tools/security/afl/qemu-patches/syscall.patch b/pkgs/tools/security/afl/qemu-patches/syscall.patch index c8ffb61ba2cf..75d39386164e 100644 --- a/pkgs/tools/security/afl/qemu-patches/syscall.patch +++ b/pkgs/tools/security/afl/qemu-patches/syscall.patch @@ -1,5 +1,5 @@ ---- qemu-2.2.0/linux-user/syscall.c.orig 2014-12-09 14:45:43.000000000 +0000 -+++ qemu-2.2.0/linux-user/syscall.c 2015-03-27 06:33:00.736000000 +0000 +--- qemu-2.3.0/linux-user/syscall.c.orig 2014-12-09 14:45:43.000000000 +0000 ++++ qemu-2.3.0/linux-user/syscall.c 2015-03-27 06:33:00.736000000 +0000 @@ -227,7 +227,21 @@ _syscall3(int,sys_rt_sigqueueinfo,int,pid,int,sig,siginfo_t *,uinfo) _syscall3(int,sys_syslog,int,type,char*,bufp,int,len) diff --git a/pkgs/tools/security/afl/qemu-patches/translate-all.patch b/pkgs/tools/security/afl/qemu-patches/translate-all.patch index 89163b607fdc..180b3a55ab25 100644 --- a/pkgs/tools/security/afl/qemu-patches/translate-all.patch +++ b/pkgs/tools/security/afl/qemu-patches/translate-all.patch @@ -1,6 +1,6 @@ ---- qemu-2.2.0/translate-all.c.orig 2014-12-09 14:45:46.000000000 +0000 -+++ qemu-2.2.0/translate-all.c 2015-01-28 22:37:42.383000000 +0000 -@@ -387,8 +387,13 @@ +--- qemu-2.3.0/translate-all.c.orig 2014-12-09 14:45:46.000000000 +0000 ++++ qemu-2.3.0/translate-all.c 2015-01-28 22:37:42.383000000 +0000 +@@ -393,8 +393,13 @@ /* We can't use g_malloc because it may recurse into a locked mutex. */ # define ALLOC(P, SIZE) \ do { \ diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 5b69811d08d6..3dd47f50cf76 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -7,7 +7,7 @@ with stdenv.lib; let - n = "qemu-2.2.0"; + n = "qemu-2.3.0"; aflHeaderFile = writeText "afl-qemu-cpu-inl.h" (builtins.readFile ./qemu-patches/afl-qemu-cpu-inl.h); @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; + sha256 = "120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn"; }; buildInputs = From 5762db8504cd639e593a293cb9ed6900f7d58231 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 27 May 2015 16:36:08 -0500 Subject: [PATCH 013/127] nixpkgs: luajit 2.0.3 -> 2.0.4 Signed-off-by: Austin Seipp --- pkgs/development/interpreters/luajit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index f0d9d03991b8..8e148f1189cd 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "luajit-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"; + sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; }; enableParallelBuilding = true; From 4d12ea8311c8a55bd905ed4b9d5480481c4c3726 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 28 May 2015 03:15:42 +0000 Subject: [PATCH 014/127] Add micro-httpd package --- pkgs/servers/http/micro-httpd/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/http/micro-httpd/default.nix diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix new file mode 100644 index 000000000000..ba7c69ef7dbf --- /dev/null +++ b/pkgs/servers/http/micro-httpd/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "micro-httpd-20140814"; + + src = fetchurl { + url = "http://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz"; + sha256 = "0mlm24bi31s0s8w55i0sysv2nc1n2x4cfp6dm47slz49h2fz24rk"; + }; + + preBuild = '' + makeFlagsArray=(BINDIR="$out/bin" MANDIR="$out/share/man/man8") + mkdir -p $out/bin + mkdir -p $out/share/man/man8 + ''; + + meta = with stdenv.lib; { + homepage = "http://acme.com/software/micro_httpd/"; + description = "a really small HTTP server"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ copumpkin ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1066161dc9b1..41c0e0436e9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8722,6 +8722,8 @@ let mpdscribble = callPackage ../tools/misc/mpdscribble { }; + microHttpd = callPackage ../servers/http/micro-httpd { }; + miniHttpd = callPackage ../servers/http/mini-httpd {}; mlmmj = callPackage ../servers/mail/mlmmj { }; From 2906376ddc99d9d36199a9eaf3ee6892fb83b154 Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 28 May 2015 00:26:17 -0400 Subject: [PATCH 015/127] libclxclient: reacfor & fix include directory --- .../libraries/libclxclient/default.nix | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 7d0e4596dd0b..4dc103515ac7 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,38 +1,41 @@ -{ stdenv, fetchurl, libclthreads, libXft, libX11, xlibs }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xlibs }: stdenv.mkDerivation rec { name = "libclxclient-${version}"; version = "3.9.0"; + src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; }; - buildInputs = [ - libclthreads libXft libX11 xlibs.xproto - ]; + buildInputs = [ libclthreads libX11 libXft xlibs.xproto ]; - configurePhase = '' - cpp -v - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xlibs.xproto}/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXft}/include" - echo $NIX_CFLAGS_COMPILE - sed -e "s@/usr/local@$out@" -i Makefile - sed -e "s@#include @#include <${libclthreads}/include>@" -i clxclient.h + NIX_CFLAGS_COMPILE = "-I${xlibs.xproto}/include -I${libXft}/include"; + + patchPhase = '' sed -e "s@ldconfig@@" -i Makefile - sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile ''; - fixupPhase = '' + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=''" + ]; + + preInstall = '' + # The Makefile does not create the include directory + mkdir -p $out/include + ''; + + postInstall = '' ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3 ''; - meta = { - description = "zita X11 library"; - version = "${version}"; + meta = with stdenv.lib; { + description = "Zita X11 library"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; }; } From 83fa9994e5c34a516c0eb9f7eed7b841e4cb85a2 Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 28 May 2015 01:53:23 -0400 Subject: [PATCH 016/127] libclthreads: refactor fix include directories fix symlink to library --- .../libraries/libclthreads/default.nix | 42 +++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index 5d5a9e49381f..ea27046279c7 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -1,26 +1,42 @@ -{ stdenv, fetchurl, }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libclthreads-${version}"; version = "2.4.0"; + src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6"; }; - configurePhase = '' - sed -e "s@/usr/local@$out@" -i Makefile - sed -e "s@/usr/bin/install@install@" -i Makefile - sed -e "s@/sbin/ldconfig@ldconfig@" -i Makefile - sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile + patchPhase = '' + # Fix hardcoded paths to executables + sed -e "s@/usr/bin/install@install@" -i ./Makefile + sed -e "s@/sbin/ldconfig@ldconfig@" -i ./Makefile + + # Remove useless symlink: /lib64 -> /lib + sed -e '/ln -sf \$(CLTHREADS_MIN) \$(PREFIX)\/\$(LIBDIR)\/\$(CLTHREADS_SO)/d' -i ./Makefile ''; - meta = { - description = "zita thread library"; - version = "${version}"; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=''" + ]; + + preInstall = '' + # The Makefile does not create the include directory + mkdir -p $out/include + ''; + + postInstall = '' + ln -s $out/lib/libclthreads.so.${version} $out/lib/libclthreads.so + ''; + + meta = with stdenv.lib; { + description = "Zita thread library"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + license = licenses.lgpl21; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; }; } From 0a9d9639ea1e606b50a42f5f5798ef0ac22f63e0 Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 28 May 2015 01:57:38 -0400 Subject: [PATCH 017/127] jaaa: refactor --- pkgs/applications/audio/jaaa/default.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index b855bd296604..0f29ce34cacf 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -25,29 +25,20 @@ stdenv.mkDerivation rec { "-I${zita-alsa-pcmi}/include" ]; - patchPhase = '' - cd source/ - sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.cc') - sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.cc') - sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.h') - sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.h') - ''; + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=''" + ]; - buildlPhase = '' - make PREFIX="$out" - ''; - - installPhase = '' - echo zita= ${zita-alsa-pcmi} - make PREFIX="$out" install - install -Dm644 ../README "$out/README" + preConfigure = '' + cd ./source/ ''; meta = with stdenv.lib; { homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; description = "JACK and ALSA Audio Analyser"; license = licenses.gpl2; - maintainers = [ maintainers.magnetophon ]; + maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; }; } From 045e93e0a660e2db58403ee3bf40ada2d351971e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Mon, 20 Apr 2015 21:54:58 +0100 Subject: [PATCH 018/127] mesos-slave: docker and IP address config options - Usage of docker containerizer is currently hardcoded, this PR makes it optional. Default is to enable it if docker is enabled. - Make IP address to listen on part of service configuration. --- nixos/modules/services/misc/mesos-slave.nix | 25 ++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 26fb3fdb00c9..811aa812c8d9 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -12,6 +12,8 @@ let attribsArg = optionalString (cfg.attributes != {}) "--attributes=${mkAttributes cfg.attributes}"; + containerizers = [ "mesos" ] ++ (optional cfg.withDocker "docker"); + in { options.services.mesos = { @@ -22,8 +24,14 @@ in { type = types.uniq types.bool; }; + ip = mkOption { + description = "IP address to listen on."; + default = "0.0.0.0"; + type = types.string; + }; + port = mkOption { - description = "Mesos Slave port"; + description = "Port to listen on."; default = 5051; type = types.int; }; @@ -43,6 +51,12 @@ in { type = types.bool; }; + withDocker = mkOption { + description = "Enable the docker containerizer."; + default = config.virtualisation.docker.enable; + type = types.bool; + }; + workDir = mkOption { description = "The Mesos work directory."; default = "/var/lib/mesos/slave"; @@ -92,17 +106,18 @@ in { description = "Mesos Slave"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; - environment.MESOS_CONTAINERIZERS = "docker,mesos"; + environment.MESOS_CONTAINERIZERS = concatStringsSep "," containerizers; serviceConfig = { ExecStart = '' ${pkgs.mesos}/bin/mesos-slave \ + --ip=${cfg.ip} \ --port=${toString cfg.port} \ --master=${cfg.master} \ - ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ - ${attribsArg} \ --work_dir=${cfg.workDir} \ --logging_level=${cfg.logLevel} \ - --docker=${pkgs.docker}/libexec/docker/docker \ + ${attribsArg} \ + ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ + ${optionalString cfg.withDocker "--docker=${pkgs.docker}/libexec/docker/docker"} \ ${toString cfg.extraCmdLineOptions} ''; PermissionsStartOnly = true; From e4fece4f287083cb9f70124c5c71612d4a2df8ff Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 28 May 2015 02:12:45 -0400 Subject: [PATCH 019/127] tetraproc: refactor --- pkgs/applications/audio/tetraproc/default.nix | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index de351a720226..b1356d3c5474 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -1,33 +1,30 @@ -{ stdenv, fetchurl, jack2, libclthreads, libclxclient, fftwFloat, libsndfile, freetype, x11 -}: +{ stdenv, fetchurl, fftwFloat, freetype, jack2, libclthreads, libclxclient, libsndfile, x11 }: stdenv.mkDerivation rec { name = "tetraproc-${version}"; version = "0.8.2"; + src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv"; }; - buildInputs = [ - jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11 + buildInputs = [ jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11 ]; + + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=''" ]; - patchPhase = '' - cd source - sed -e "s@#include @#include <${libclthreads}/include>@" -i tetraproc.cc - sed -e "s@#include @#include <${libclxclient}/include>@" -i *.h - sed -e "s@#include @#include <${libclthreads}/include>@" -i *.h - sed -e "s@#include @#include <${libclxclient}/include>@" -i png2img.* - sed -e "s@/usr/local@$out@" -i Makefile + preConfigure = '' + cd ./source/ ''; - meta = { + meta = with stdenv.lib; { description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording"; - version = "${version}"; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/; + license = licenses.gpl2; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; }; } From c9d22a69b10af014ab08c0c3bf6e488da59a5463 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 28 May 2015 10:25:11 +0200 Subject: [PATCH 020/127] nixos: Add lightdm test to release.nix. This is just to let it run on Hydra but doesn't have an affect on channel updates. Signed-off-by: aszlig --- nixos/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release.nix b/nixos/release.nix index dfc28173f1a3..3559926eefad 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -271,6 +271,7 @@ in rec { tests.kde4 = callTest tests/kde4.nix {}; tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; }); tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; + tests.lightdm = callTest tests/lightdm.nix {}; tests.login = callTest tests/login.nix {}; #tests.logstash = callTest tests/logstash.nix {}; tests.misc = callTest tests/misc.nix {}; From f0d0617827c49dc5e7c72580a40a3d01e82c9ff4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 28 May 2015 10:27:29 +0200 Subject: [PATCH 021/127] nixos: Add lightdm test to the "tested" job. This is to prevent bugs such as #7902 from hitting the channels again. Signed-off-by: aszlig --- nixos/release-combined.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index a79f72823fdf..d501c2e7c535 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -64,6 +64,7 @@ in rec { (all nixos.tests.installer.btrfsSubvolDefault) (all nixos.tests.ipv6) (all nixos.tests.kde4) + (all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) (all nixos.tests.nat.firewall) From d2e364c6781359a0fd6ea66b041d37e061b01cef Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 28 May 2015 11:38:59 +0300 Subject: [PATCH 022/127] unbreak the nixpkgs monitor: url -> urls --- pkgs/applications/altcoins/bitcoin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index b759b2dcb2cf..7be2b90551ec 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec{ version = core_version; src = fetchurl { - url = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" - "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" - ]; + urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" + "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" + ]; sha256 = "cddf96c71d0a35524fde93380981cf0cf0b51441454a3a68b9be491b9239bfec"; }; From 88e58a4fa208a967c4e4bde5beda86e44eca9c12 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 26 May 2015 15:18:49 +0200 Subject: [PATCH 023/127] cygwin: stdenv --- maintainers/scripts/hydra_eval_check | 1 + .../cygwin/all-buildinputs-as-runtimedep.sh | 16 ++++ pkgs/stdenv/cygwin/rebase-i686.sh | 21 ++++++ pkgs/stdenv/cygwin/rebase-x86_64.sh | 21 ++++++ pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh | 74 +++++++++++++++++++ pkgs/stdenv/default.nix | 2 + pkgs/stdenv/generic/default.nix | 3 + pkgs/stdenv/native/default.nix | 23 ++++-- pkgs/top-level/release-lib.nix | 2 + 9 files changed, 158 insertions(+), 5 deletions(-) create mode 100644 pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh create mode 100644 pkgs/stdenv/cygwin/rebase-i686.sh create mode 100644 pkgs/stdenv/cygwin/rebase-x86_64.sh create mode 100644 pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh diff --git a/maintainers/scripts/hydra_eval_check b/maintainers/scripts/hydra_eval_check index e16a40455a31..c8e03424f320 100755 --- a/maintainers/scripts/hydra_eval_check +++ b/maintainers/scripts/hydra_eval_check @@ -6,6 +6,7 @@ hydra_eval_jobs \ --argstr system i686-linux \ --argstr system x86_64-darwin \ --argstr system i686-cygwin \ + --argstr system x86_64-cygwin \ --argstr system i686-freebsd \ --arg officialRelease false \ --arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \ diff --git a/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh b/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh new file mode 100644 index 000000000000..7cb6a58f180b --- /dev/null +++ b/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh @@ -0,0 +1,16 @@ +# On cygwin, automatic runtime dependency detection does not work +# because the binaries do not contain absolute references to store +# locations (yet) +postFixupHooks+=(_cygwinAllBuildInputsAsRuntimeDep) + +_cygwinAllBuildInputsAsRuntimeDep() { + if [ -n "$buildInputs" ]; then + mkdir -p "$out/nix-support" + echo "$buildInputs" >> "$out/nix-support/cygwin-buildinputs-as-runtime-deps" + fi + + if [ -n "$nativeBuildInputs" ]; then + mkdir -p "$out/nix-support" + echo "$nativeBuildInputs" >> "$out/nix-support/cygwin-buildinputs-as-runtime-deps" + fi +} diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/pkgs/stdenv/cygwin/rebase-i686.sh new file mode 100644 index 000000000000..e5695c75a967 --- /dev/null +++ b/pkgs/stdenv/cygwin/rebase-i686.sh @@ -0,0 +1,21 @@ +postFixupHooks+=(_cygwinFixAutoImageBase) + +_cygwinFixAutoImageBase() { + find $out -name "*.dll" | while read DLL; do + if [ -f /etc/rebasenix.nextbase ]; then + NEXTBASE="$(>16)+1)<<16)) + + echo "REBASE FIX: $DLL $BASE -> $NEXTBASE" + /bin/rebase -b $NEXTBASE $DLL + NEXTBASE="0x`printf %x $(($NEXTBASE+$SKIP))`" + + echo $NEXTBASE > /etc/rebasenix.nextbase + done +} diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh new file mode 100644 index 000000000000..f782f18dfd15 --- /dev/null +++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh @@ -0,0 +1,21 @@ +postFixupHooks+=(_cygwinFixAutoImageBase) + +_cygwinFixAutoImageBase() { + find $out -name "*.dll" | while read DLL; do + if [ -f /etc/rebasenix.nextbase ]; then + NEXTBASE="$(>16)+1)<<16)) + + echo "REBASE FIX: $DLL $BASE -> $NEXTBASE" + /bin/rebase -b $NEXTBASE $DLL + NEXTBASE="0x`printf %x $(($NEXTBASE+$SKIP))`" + + echo $NEXTBASE > /etc/rebasenix.nextbase + done +} diff --git a/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh b/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh new file mode 100644 index 000000000000..d0da8c1b65c2 --- /dev/null +++ b/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh @@ -0,0 +1,74 @@ +postFixupHooks+=(_cygwinWrapExesToFindDlls) + +_cygwinWrapExesToFindDlls() { + find $out -type l | while read LINK; do + TARGET="$(readlink "${LINK}")" + + # fix all non .exe links that link explicitly to a .exe + if [[ ${TARGET} == *.exe ]] && [[ ${LINK} != *.exe ]]; then + mv "${LINK}" "${LINK}.exe" + LINK="${LINK}.exe" + fi + + # generate complementary filenames + if [[ ${LINK} == *.exe ]]; then + _LINK="${LINK%.exe}" + _TARGET="${TARGET%.exe}" + else + _LINK="${LINK}.exe" + _TARGET="${TARGET}.exe" + fi + + # check if sould create complementary link + DOLINK=1 + if [[ ${_TARGET} == *.exe ]]; then + # the canonical target has to be a .exe + CTARGET="$(readlink -f "${LINK}")" + if [[ ${CTARGET} != *.exe ]]; then + CTARGET="${CTARGET}.exe" + fi + + if [ ! -e "${CTARGET}" ]; then + unset DOLINK + fi + fi + + if [ -e "${_LINK}" ]; then + # complementary link seems to exist + # but could be cygwin smoke and mirrors + INO=$(stat -c%i "${LINK}") + _INO=$(stat -c%i "${_LINK}") + if [ "${INO}" -ne "${_INO}" ]; then + unset DOLINK + fi + fi + + # create complementary link + if [ -n "${DOLINK}" ]; then + ln -s "${_TARGET}" "${_LINK}.tmp" + mv "${_LINK}.tmp" "${_LINK}" + fi + done + + find $out -type f -name "*.exe" | while read EXE; do + WRAPPER="${EXE%.exe}" + if [ -e "${WRAPPER}" ]; then + # check if really exists or cygwin smoke and mirrors + INO=$(stat -c%i "${EXE}") + _INO=$(stat -c%i "${WRAPPER}") + if [ "${INO}" -ne "${_INO}" ]; then + continue + fi + fi + + mv "${EXE}" "${EXE}.tmp" + + cat >"${WRAPPER}" < Date: Thu, 23 Oct 2014 16:14:48 +0200 Subject: [PATCH 024/127] cygwin: build perl as usual, no sysPerl --- .../interpreters/perl/sys-perl/default.nix | 19 ------------------- .../interpreters/perl/sys-perl/setup-hook.sh | 5 ----- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/interpreters/perl/sys-perl/default.nix delete mode 100644 pkgs/development/interpreters/perl/sys-perl/setup-hook.sh diff --git a/pkgs/development/interpreters/perl/sys-perl/default.nix b/pkgs/development/interpreters/perl/sys-perl/default.nix deleted file mode 100644 index e30ce92c61e4..000000000000 --- a/pkgs/development/interpreters/perl/sys-perl/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv }: - -stdenv.mkDerivation rec { - name = "perl"; - - unpackPhase = "true"; - - installPhase = - '' - mkdir -p $out/bin - ln -s /usr/bin/perl $out/bin - ''; - - setupHook = ./setup-hook.sh; - - libPrefix = "lib/perl5/site_perl/5.10/i686-cygwin"; - - passthru.libPrefix = libPrefix; -} diff --git a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh b/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh deleted file mode 100644 index 7b03c15ec5ad..000000000000 --- a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/@libPrefix@ -} - -envHooks+=(addPerlLibPath) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8713dab4786e..60cffbbf4d95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4807,7 +4807,7 @@ let fetchurl = fetchurlBoot; }; - perl = if system != "i686-cygwin" then perl520 else sysPerl; + perl = perl520; php = php56; @@ -4965,8 +4965,6 @@ let supercollider_scel = supercollider.override { useSCEL = true; }; - sysPerl = callPackage ../development/interpreters/perl/sys-perl { }; - tcl = tcl-8_6; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; From b658196c6c00f02878e8e5c4c55c8cc871314e83 Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Thu, 23 Oct 2014 12:03:01 +0200 Subject: [PATCH 025/127] cygwin: libiconv and gettext for x86_64 --- .../development/libraries/gettext/default.nix | 10 +- .../libraries/libiconv/default.nix | 7 +- .../libiconv/libiconv-1.14-reloc.patch | 269 ++++++++++++++++++ .../libiconv/libiconv-1.14-wchar.patch | 102 +++++++ 4 files changed, 384 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch create mode 100644 pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 8f6277ca2e94..15f11f8a133d 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -12,11 +12,13 @@ stdenv.mkDerivation (rec { configureFlags = [ "--disable-csharp" "--with-xz" ] ++ (stdenv.lib.optionals stdenv.isCygwin - [ # We have a static libiconv, so we can only build the static lib. - "--disable-shared" "--enable-static" - + [ "--disable-java" + "--disable-native-java" # Share the cache among the various `configure' runs. "--config-cache" + "--with-included-gettext" + "--with-included-glib" + "--with-included-libcroco" ]); # On cross building, gettext supposes that the wchar.h from libc @@ -28,6 +30,8 @@ stdenv.mkDerivation (rec { echo gl_cv_func_wcwidth_works=yes > cachefile configureFlags="$configureFlags --cache-file=`pwd`/cachefile" fi + '' + stdenv.lib.optionalString stdenv.isCygwin '' + sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in ''; buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 9e65e63ffdb8..70b0574a7b46 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -10,11 +10,16 @@ stdenv.mkDerivation rec { sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"; }; + patches = if stdenv.isCygwin then [ + ./libiconv-1.14-reloc.patch + ./libiconv-1.14-wchar.patch + ] else null; + # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL # (Windows' linker would need to be used somehow to produce an actual # DLL.) Thus, build the static library too, and this is what Gettext # will actually use. - configureFlags = stdenv.lib.optional stdenv.isCygwin [ "--enable-static" ]; + configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else null; crossAttrs = { # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW). diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch new file mode 100644 index 000000000000..005e3379d165 --- /dev/null +++ b/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch @@ -0,0 +1,269 @@ +--- libiconv-1.14/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 ++++ libiconv-1.14/lib/relocatable.c 2011-10-15 03:14:13.195133600 -0400 +@@ -2,20 +2,18 @@ + Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + +- This program is free software; you can redistribute it and/or modify it +- under the terms of the GNU Library General Public License as published +- by the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as published by ++ the Free Software Foundation; either version 2.1 of the License, or ++ (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU Library General Public +- License along with this program; if not, write to the Free Software +- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +- USA. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + + /* Tell glibc's to provide a prototype for getline(). +@@ -87,6 +85,19 @@ + # define FILE_SYSTEM_PREFIX_LEN(P) 0 + #endif + ++/* Whether to enable the more costly support for relocatable libraries. ++ It allows libraries to be have been installed with a different original ++ prefix than the program. But it is quite costly, especially on Cygwin ++ platforms, see below. Therefore we enable it by default only on native ++ Win32 platforms. */ ++#ifndef ENABLE_COSTLY_RELOCATABLE ++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ ++# define ENABLE_COSTLY_RELOCATABLE 1 ++# else ++# define ENABLE_COSTLY_RELOCATABLE 0 ++# endif ++#endif ++ + /* Original installation prefix. */ + static char *orig_prefix; + static size_t orig_prefix_len; +@@ -156,7 +167,7 @@ + #endif + } + +-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) ++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) + + /* Convenience function: + Computes the current installation prefix, based on the original +@@ -286,7 +297,7 @@ + + #endif /* !IN_LIBRARY || PIC */ + +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + + /* Full pathname of shared library, or NULL. */ + static char *shared_library_fullname; +@@ -332,7 +343,9 @@ + #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ + /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() + function. +- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ ++ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. ++ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on ++ Cygwin 1.7. */ + FILE *fp; + + /* Open the current process' maps file. It describes one VMA per line. */ +@@ -405,7 +418,7 @@ + const char * + relocate (const char *pathname) + { +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + static int initialized; + + /* Initialization code for a shared library. */ +--- libiconv-1.14/libcharset/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 ++++ libiconv-1.14/libcharset/lib/relocatable.c 2011-10-15 03:14:27.878133600 -0400 +@@ -2,20 +2,18 @@ + Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + +- This program is free software; you can redistribute it and/or modify it +- under the terms of the GNU Library General Public License as published +- by the Free Software Foundation; either version 2, or (at your option) +- any later version. ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as published by ++ the Free Software Foundation; either version 2.1 of the License, or ++ (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU Library General Public +- License along with this program; if not, write to the Free Software +- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +- USA. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + + /* Tell glibc's to provide a prototype for getline(). +@@ -87,6 +85,19 @@ + # define FILE_SYSTEM_PREFIX_LEN(P) 0 + #endif + ++/* Whether to enable the more costly support for relocatable libraries. ++ It allows libraries to be have been installed with a different original ++ prefix than the program. But it is quite costly, especially on Cygwin ++ platforms, see below. Therefore we enable it by default only on native ++ Win32 platforms. */ ++#ifndef ENABLE_COSTLY_RELOCATABLE ++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ ++# define ENABLE_COSTLY_RELOCATABLE 1 ++# else ++# define ENABLE_COSTLY_RELOCATABLE 0 ++# endif ++#endif ++ + /* Original installation prefix. */ + static char *orig_prefix; + static size_t orig_prefix_len; +@@ -156,7 +167,7 @@ + #endif + } + +-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) ++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) + + /* Convenience function: + Computes the current installation prefix, based on the original +@@ -286,7 +297,7 @@ + + #endif /* !IN_LIBRARY || PIC */ + +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + + /* Full pathname of shared library, or NULL. */ + static char *shared_library_fullname; +@@ -332,7 +343,9 @@ + #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ + /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() + function. +- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ ++ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. ++ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on ++ Cygwin 1.7. */ + FILE *fp; + + /* Open the current process' maps file. It describes one VMA per line. */ +@@ -405,7 +418,7 @@ + const char * + relocate (const char *pathname) + { +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + static int initialized; + + /* Initialization code for a shared library. */ +--- libiconv-1.14/srclib/relocatable.c 2011-08-07 09:42:06.000000000 -0400 ++++ libiconv-1.14/srclib/relocatable.c 2011-10-15 03:14:37.739133600 -0400 +@@ -3,16 +3,16 @@ + Written by Bruno Haible , 2003. + + This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or ++ it under the terms of the GNU Lesser General Public License as published by ++ the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ + + +@@ -85,6 +85,19 @@ + # define FILE_SYSTEM_PREFIX_LEN(P) 0 + #endif + ++/* Whether to enable the more costly support for relocatable libraries. ++ It allows libraries to be have been installed with a different original ++ prefix than the program. But it is quite costly, especially on Cygwin ++ platforms, see below. Therefore we enable it by default only on native ++ Win32 platforms. */ ++#ifndef ENABLE_COSTLY_RELOCATABLE ++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ ++# define ENABLE_COSTLY_RELOCATABLE 1 ++# else ++# define ENABLE_COSTLY_RELOCATABLE 0 ++# endif ++#endif ++ + /* Original installation prefix. */ + static char *orig_prefix; + static size_t orig_prefix_len; +@@ -154,7 +167,7 @@ + #endif + } + +-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) ++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) + + /* Convenience function: + Computes the current installation prefix, based on the original +@@ -284,7 +297,7 @@ + + #endif /* !IN_LIBRARY || PIC */ + +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + + /* Full pathname of shared library, or NULL. */ + static char *shared_library_fullname; +@@ -330,7 +343,9 @@ + #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ + /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() + function. +- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ ++ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. ++ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on ++ Cygwin 1.7. */ + FILE *fp; + + /* Open the current process' maps file. It describes one VMA per line. */ +@@ -403,7 +418,7 @@ + const char * + relocate (const char *pathname) + { +-#if defined PIC && defined INSTALLDIR ++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE + static int initialized; + + /* Initialization code for a shared library. */ +--- libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-07 09:42:12.000000000 -0400 ++++ libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-30 02:40:45.597317000 -0400 +@@ -164,6 +164,7 @@ gl_UNISTD_MODULE_INDICATOR([readlink]) + gl_RELOCATABLE([$gl_source_base]) + if test $RELOCATABLE = yes; then + AC_LIBOBJ([progreloc]) ++ AC_LIBOBJ([relocatable]) + fi + gl_FUNC_READLINK_SEPARATE + gl_CANONICALIZE_LGPL_SEPARATE diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch new file mode 100644 index 000000000000..0e4ddd931bb0 --- /dev/null +++ b/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch @@ -0,0 +1,102 @@ +--- libiconv-1.14/libcharset/lib/localcharset.c 2011-02-28 17:43:35.000000000 -0500 ++++ libiconv-1.14/libcharset/lib/localcharset.c 2011-08-28 00:16:57.238000000 -0400 +@@ -54,10 +54,6 @@ + # include + # endif + # endif +-# ifdef __CYGWIN__ +-# define WIN32_LEAN_AND_MEAN +-# include +-# endif + #elif defined WIN32_NATIVE + # define WIN32_LEAN_AND_MEAN + # include +@@ -124,7 +120,7 @@ + cp = charset_aliases; + if (cp == NULL) + { +-#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) ++#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE) + const char *dir; + const char *base = "charset.alias"; + char *file_name; +@@ -309,7 +305,7 @@ + "DECKOREAN" "\0" "EUC-KR" "\0"; + # endif + +-# if defined WIN32_NATIVE || defined __CYGWIN__ ++# if defined WIN32_NATIVE + /* To avoid the troubles of installing a separate file in the same + directory as the DLL and of retrieving the DLL's directory at + runtime, simply inline the aliases here. */ +@@ -365,64 +361,12 @@ + + # if HAVE_LANGINFO_CODESET + +- /* Most systems support nl_langinfo (CODESET) nowadays. */ +- codeset = nl_langinfo (CODESET); +- +-# ifdef __CYGWIN__ +- /* Cygwin < 1.7 does not have locales. nl_langinfo (CODESET) always +- returns "US-ASCII". Return the suffix of the locale name from the +- environment variables (if present) or the codepage as a number. */ +- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) +- { +- const char *locale; +- static char buf[2 + 10 + 1]; +- +- locale = getenv ("LC_ALL"); +- if (locale == NULL || locale[0] == '\0') +- { +- locale = getenv ("LC_CTYPE"); +- if (locale == NULL || locale[0] == '\0') +- locale = getenv ("LANG"); +- } +- if (locale != NULL && locale[0] != '\0') +- { +- /* If the locale name contains an encoding after the dot, return +- it. */ +- const char *dot = strchr (locale, '.'); +- +- if (dot != NULL) +- { +- const char *modifier; +- +- dot++; +- /* Look for the possible @... trailer and remove it, if any. */ +- modifier = strchr (dot, '@'); +- if (modifier == NULL) +- return dot; +- if (modifier - dot < sizeof (buf)) +- { +- memcpy (buf, dot, modifier - dot); +- buf [modifier - dot] = '\0'; +- return buf; +- } +- } +- } +- +- /* Woe32 has a function returning the locale's codepage as a number: +- GetACP(). This encoding is used by Cygwin, unless the user has set +- the environment variable CYGWIN=codepage:oem (which very few people +- do). +- Output directed to console windows needs to be converted (to +- GetOEMCP() if the console is using a raster font, or to +- GetConsoleOutputCP() if it is using a TrueType font). Cygwin does +- this conversion transparently (see winsup/cygwin/fhandler_console.cc), +- converting to GetConsoleOutputCP(). This leads to correct results, +- except when SetConsoleOutputCP has been called and a raster font is +- in use. */ +- sprintf (buf, "CP%u", GetACP ()); +- codeset = buf; +- } +-# endif ++ /* Most systems support nl_langinfo (CODESET) nowadays. ++ POSIX allows that the returned pointer may point to a static area that ++ may be overwritten by subsequent calls to setlocale or nl_langinfo. */ ++ static char codeset_buf[64]; ++ codeset_buf[0] = '\0'; ++ codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf)); + + # else + From 67ac12795a453b20288b8e28e83cdf5dc8cbf8da Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Thu, 23 Oct 2014 14:38:54 +0200 Subject: [PATCH 026/127] cygwin: add cygwin compatible bash version. --- pkgs/shells/bash/bash-4.1-patches.nix | 21 + pkgs/shells/bash/bash-4.1.17-9.src.patch | 987 +++++++++++++++++++++++ pkgs/shells/bash/default.nix | 21 +- 3 files changed, 1025 insertions(+), 4 deletions(-) create mode 100644 pkgs/shells/bash/bash-4.1-patches.nix create mode 100644 pkgs/shells/bash/bash-4.1.17-9.src.patch diff --git a/pkgs/shells/bash/bash-4.1-patches.nix b/pkgs/shells/bash/bash-4.1-patches.nix new file mode 100644 index 000000000000..2affe1efa606 --- /dev/null +++ b/pkgs/shells/bash/bash-4.1-patches.nix @@ -0,0 +1,21 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "0y02cbfnc5s3dnwr4fw2nz43f3b826f5084mk7qd0lzq12hpzr56") +(patch "002" "1y3qzw6lx16vnb8hrw3zx01z25k773cbmgysvs3vvcw6w6fj4bij") +(patch "003" "0v95ng8qa78dbh26rr6jpzkn3s6n78xymymkvvvkz35rpgfksxli") +(patch "004" "17pzykkywh5jmdy1ikj9xyxm7qm29ii2fmrfpyjr1wy16jx67h3q") +(patch "005" "06lwfgxx9kacz018nr4dmxqqrzipcg8pjn61gr6yfjv6s7c3k5ji") +(patch "006" "0j9c1zhhwvc2p4cdxi77nxmcxa00cimaxwbhasyqgc606g7sp1jr") +(patch "007" "19q5qba77hfda8g4xylh77awiakhr1d1asgbqcrbakxs50n2l0bl") +(patch "008" "058j911q9wcbr93w59jnpgmdpx4qsq3gvd6m9nwgdk9j2hjjqb2f") +(patch "009" "1lany70f0rx1i2xikzkahr1zskh8620j05ic0gc5x2p89ab0ch5x") +(patch "010" "05fqv7w12g9izy332wypynilgxzdh87vy5q2pqq3bjdncyl5hxvr") +(patch "011" "088n54yh5zp8aa917y1ng3802amchgal1acn0v0mdjqj0yi82aqv") +(patch "012" "0vbvc1vxljyd882wk6rcd64xrf1lda6wirys41mqjbl0lalj8bi7") +(patch "013" "1y7x62i0q3wkr9jdjzvm2rl9dp11vzp8fwkz2zb2x21l0pi25mya") +(patch "014" "0gpizgbx1w712awpd11x5nvahpranl0aiq16nhp3xmm8vvz1wpar") +(patch "015" "17nf6kw1vhmzn9nzb1vyn8r4wp2nl109f9yawzavjkf06670ln7c") +(patch "016" "129hknigxhxrh1rbjhc4fm6argpjb6lp9fl616narbnzsv3qhc3l") +(patch "017" "0vy02x6fmpd6i66n97r4fwrq9pncbgzya07iyca2bb6yyzmymgg5") +] diff --git a/pkgs/shells/bash/bash-4.1.17-9.src.patch b/pkgs/shells/bash/bash-4.1.17-9.src.patch new file mode 100644 index 000000000000..f236946483c2 --- /dev/null +++ b/pkgs/shells/bash/bash-4.1.17-9.src.patch @@ -0,0 +1,987 @@ +--- Makefile.in 2009-12-30 10:05:40.000000000 -0800 ++++ Makefile.in 2014-10-08 13:50:27.419837900 -0700 +@@ -565,7 +565,7 @@ lint: + ${MAKE} ${MFLAGS} CFLAGS='${GCC_LINT_FLAGS}' .made + + version.h: $(SOURCES) config.h Makefile +- $(SHELL) $(SUPPORT_SRC)mkversion.sh -b -S ${topdir} -s $(RELSTATUS) -d $(Version) -o newversion.h \ ++ $(SHELL) $(SUPPORT_SRC)mkversion.sh -S ${topdir} -s $(RELSTATUS) -d $(Version) -o newversion.h \ + && mv newversion.h version.h + + bashversion$(EXEEXT): patchlevel.h conftypes.h version.h buildversion.o $(SUPPORT_SRC)bashversion.c +--- bashline.c 2014-10-08 13:45:09.240173500 -0700 ++++ bashline.c 2014-10-08 13:50:27.419837900 -0700 +@@ -68,6 +68,12 @@ + # include "pcomplete.h" + #endif + ++#ifdef __x86_64__ ++#define IMP(x) __imp_##x ++#else ++#define IMP(x) _imp__##x ++#endif ++ + /* These should agree with the defines for emacs_mode and vi_mode in + rldefs.h, even though that's not a public readline header file. */ + #ifndef EMACS_EDITING_MODE +@@ -239,6 +245,11 @@ int no_empty_command_completion; + are the only possible matches, even if FIGNORE says to. */ + int force_fignore = 1; + ++#if __CYGWIN__ ++/* If set, shorten "foo.exe" to "foo" when they are the same file. */ ++int completion_strip_exe; ++#endif /* __CYGWIN__ */ ++ + /* Perform spelling correction on directory names during word completion */ + int dircomplete_spelling = 0; + +@@ -446,11 +457,12 @@ initialize_readline () + kseq[0] = CTRL('J'); + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == rl_vi_editing_mode) ++ extern rl_command_func_t *IMP(rl_vi_editing_mode); ++ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) + rl_unbind_key_in_map (CTRL('J'), emacs_meta_keymap); + kseq[0] = CTRL('M'); + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == rl_vi_editing_mode) ++ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) + rl_unbind_key_in_map (CTRL('M'), emacs_meta_keymap); + #if defined (VI_MODE) + rl_unbind_key_in_map (CTRL('E'), vi_movement_keymap); +@@ -469,7 +481,8 @@ initialize_readline () + kseq[0] = '~'; + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == 0 || func == rl_tilde_expand) ++ extern rl_command_func_t *IMP(rl_tilde_expand); ++ if (func == 0 || func == rl_tilde_expand || func == IMP(rl_tilde_expand)) + rl_bind_keyseq_in_map (kseq, bash_complete_username, emacs_meta_keymap); + + rl_bind_key_if_unbound_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap); +@@ -492,7 +505,8 @@ initialize_readline () + kseq[0] = TAB; + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == 0 || func == rl_tab_insert) ++ extern rl_command_func_t *IMP(rl_tab_insert); ++ if (func == 0 || func == rl_tab_insert || func == IMP(rl_tab_insert)) + rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap); + + /* Tell the completer that we want a crack first. */ +@@ -1826,6 +1840,14 @@ globword: + /* If we have found a match, and it is an executable file or a + directory name, return it. */ + if (match && executable_or_directory (val)) ++#elif __CYGWIN__ ++ /* executable_or_directory will do the right thing on //server, ++ but calling stat("//server") is an order of magnitude slower ++ than noting that readdir("//") only returns directories. */ ++ if (match && (searching_path ? executable_file (val) ++ : ((val[0] == '/' && val[1] == '/' ++ && ! strchr (&val[2], '/')) ++ || executable_or_directory (val)))) + #else + /* If we have found a match, and it is an executable file, return it. + We don't return directory names when searching $PATH, since the +@@ -1835,6 +1857,21 @@ globword: + if (match && (searching_path ? executable_file (val) : executable_or_directory (val))) + #endif + { ++#if __CYGWIN__ ++ if (completion_strip_exe) ++ { ++ int val_len = strlen (val); ++ char *candidate; ++ if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe") ++ && (candidate = strdup (val))) ++ { ++ candidate[val_len - 4] = '\0'; ++ if (same_file (val, candidate, NULL, NULL)) ++ temp[strlen (temp) - 4] = '\0'; ++ free (candidate); ++ } ++ } ++#endif + free (val); + val = ""; /* So it won't be NULL. */ + return (temp); +@@ -2566,6 +2603,17 @@ test_for_directory (name) + int r; + + fn = bash_tilde_expand (name, 0); ++#if __CYGWIN__ ++ /* stat("//server") can only be successful as a directory, but takes ++ a several-second timeout to fail. It is much faster to assume ++ that //server is a valid name than it is to wait for the stat, ++ even though it gives false positives on bad names. */ ++ if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/')) ++ { ++ free (fn); ++ return 1; ++ } ++#endif /* __CYGWIN__ */ + r = file_isdir (fn); + free (fn); + +--- builtins/evalfile.c 2009-10-19 14:38:21.000000000 -0700 ++++ builtins/evalfile.c 2014-10-08 13:50:27.419837900 -0700 +@@ -148,10 +148,6 @@ file_error_and_exit: + return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1); + } + +-#if defined (__CYGWIN__) && defined (O_TEXT) +- setmode (fd, O_TEXT); +-#endif +- + if (S_ISREG (finfo.st_mode) && file_size <= SSIZE_MAX) + { + string = (char *)xmalloc (1 + file_size); +--- builtins/set.def 2009-01-04 11:32:23.000000000 -0800 ++++ builtins/set.def 2014-10-08 13:50:27.419837900 -0700 +@@ -56,6 +56,13 @@ extern int dont_save_function_defs; + #if defined (READLINE) + extern int no_line_editing; + #endif /* READLINE */ ++#if __CYGWIN__ ++extern int igncr; ++static int set_minus_o_option_maybe (int, const char *, int); ++# define INTERACTIVE_ONLY ,1 ++#else /* ! __CYGWIN__ */ ++# define INTERACTIVE_ONLY ++#endif + + $BUILTIN set + $FUNCTION set_builtin +@@ -92,6 +99,9 @@ Options: + #if defined (HISTORY) + history enable command history + #endif ++#if __CYGWIN__ ++ igncr on cygwin, ignore \r in line endings ++#endif + ignoreeof the shell will not exit upon reading EOF + interactive-comments + allow comments to appear in interactive commands +@@ -181,28 +191,40 @@ const struct { + int *variable; + setopt_set_func_t *set_func; + setopt_get_func_t *get_func; ++#if __CYGWIN__ ++ /* Cygwin users have taken to exporting SHELLOPTS for the ++ cygwin-specific igncr. As a result, we need to make sure ++ SHELLOPTS parsing does not turn on interactive options when ++ exported from an interactive shell, but parsed in a ++ non-interactive setting, since some interactive options violate ++ POSIX /bin/sh rules. */ ++ int interactive_only; ++#endif /* __CYGWIN__ */ + } o_options[] = { + { "allexport", 'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (BRACE_EXPANSION) + { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #endif + #if defined (READLINE) +- { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, ++ { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, + #endif + { "errexit", 'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "errtrace", 'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "functrace", 'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "hashall", 'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (BANG_HISTORY) +- { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, ++ { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, + #endif /* BANG_HISTORY */ + #if defined (HISTORY) +- { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL }, ++ { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, ++#endif ++#if __CYGWIN__ ++ { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL }, + #endif + { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL }, + { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "keyword", 'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, +- { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, ++ { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, + { "noclobber", 'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "noexec", 'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "noglob", 'f', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, +@@ -220,7 +242,7 @@ const struct { + { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "verbose", 'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (READLINE) +- { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, ++ { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, + #endif + { "xtrace", 'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, +@@ -407,6 +429,15 @@ int + set_minus_o_option (on_or_off, option_name) + int on_or_off; + char *option_name; ++#if __CYGWIN__ ++{ ++ /* See cygwin comments above. */ ++ return set_minus_o_option_maybe (on_or_off, option_name, 0); ++} ++static int ++set_minus_o_option_maybe (int on_or_off, const char *option_name, ++ int avoid_interactive) ++#endif /* __CYGWIN__ */ + { + register int i; + +@@ -414,6 +445,10 @@ set_minus_o_option (on_or_off, option_na + { + if (STREQ (option_name, o_options[i].name)) + { ++#if __CYGWIN__ ++ if (o_options[i].interactive_only && avoid_interactive) ++ return EXECUTION_SUCCESS; ++#endif /* __CYGWIN__ */ + if (o_options[i].letter == 0) + { + SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name); +@@ -539,7 +574,11 @@ parse_shellopts (value) + vptr = 0; + while (vname = extract_colon_unit (value, &vptr)) + { ++#if __CYGWIN__ ++ set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell); ++#else /* !__CYGWIN__ */ + set_minus_o_option (FLAG_ON, vname); ++#endif + free (vname); + } + } +--- builtins/shopt.def 2009-12-22 13:25:32.000000000 -0800 ++++ builtins/shopt.def 2014-10-08 13:50:27.435414600 -0700 +@@ -85,6 +85,10 @@ extern int check_jobs_at_exit; + extern int autocd; + extern int glob_star; + ++#if defined(__CYGWIN__) && defined(READLINE) ++extern int completion_strip_exe; ++#endif ++ + #if defined (EXTENDED_GLOB) + extern int extended_glob; + #endif +@@ -146,6 +150,9 @@ static struct { + { "compat31", &shopt_compat31, set_compatibility_level }, + { "compat32", &shopt_compat32, set_compatibility_level }, + { "compat40", &shopt_compat40, set_compatibility_level }, ++#if defined(__CYGWIN__) && defined(READLINE) ++ { "completion_strip_exe", &completion_strip_exe, NULL }, ++#endif + #if defined (READLINE) + { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL }, + #endif +--- config-top.h 2009-12-22 12:29:39.000000000 -0800 ++++ config-top.h 2014-10-08 13:50:27.435414600 -0700 +@@ -75,10 +75,10 @@ + #define KSH_COMPATIBLE_SELECT + + /* System-wide .bashrc file for interactive shells. */ +-/* #define SYS_BASHRC "/etc/bash.bashrc" */ ++//set by nix #define SYS_BASHRC "/etc/bash.bashrc" + + /* System-wide .bash_logout for login shells. */ +-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ ++//set by nix #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" + + /* Define this to make non-interactive shells begun with argv[0][0] == '-' + run the startup files when not in posix mode. */ +@@ -88,7 +88,7 @@ + sshd and source the .bashrc if so (like the rshd behavior). This checks + for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment, + which can be fooled under certain not-uncommon circumstances. */ +-/* #define SSH_SOURCE_BASHRC */ ++//set by nix #define SSH_SOURCE_BASHRC + + /* Define if you want the case-capitalizing operators (~[~]) and the + `capcase' variable attribute (declare -c). */ +--- doc/Makefile.in 2009-03-10 08:44:30.000000000 -0700 ++++ doc/Makefile.in 2014-10-08 13:50:27.435414600 -0700 +@@ -170,7 +170,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER) + $(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi + + bash.info: bashref.info +- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \ ++ ${SHELL} ${INFOPOST} < bashref.info > $@ ; \ + + bash.txt: bash.1 + bash.ps: bash.1 +@@ -226,9 +226,9 @@ install: info installdirs bash.info + -$(INSTALL_DATA) $(srcdir)/bash.1 $(DESTDIR)$(man1dir)/bash${man1ext} + -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext} + # uncomment the next lines to install the builtins man page +-# sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 +-# -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} +-# -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 ++ sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 ++ -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} ++ -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 + -if test -f bash.info; then d=.; else d=$(srcdir); fi; \ + $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info + # run install-info if it is present to update the info directory +--- doc/bash.1 2009-12-30 10:01:31.000000000 -0800 ++++ doc/bash.1 2014-10-08 13:50:27.435414600 -0700 +@@ -1568,6 +1568,14 @@ subsequently reset. + Expands to the effective user ID of the current user, initialized at + shell startup. This variable is readonly. + .TP ++.B EXECIGNORE ++A colon-separated list of extended glob (see \fBPattern Matching\fP) ++patterns. Files with full paths matching one of these patterns are ++not considered executable for the purposes of completion and PATH ++searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not ++affected. Use this variable to deal with systems that set the ++executable bit on files that are not actually executable. ++.TP + .B FUNCNAME + An array variable containing the names of all shell functions + currently in the execution call stack. +@@ -8772,6 +8780,10 @@ If set, + attempts spelling correction on directory names during word completion + if the directory name initially supplied does not exist. + .TP 8 ++.B completion_strip_exe ++If set, whenever bash sees `foo.exe' during completion, it checks if ++`foo' is the same file and strips the suffix. ++.TP 8 + .B dotglob + If set, + .B bash +--- doc/bashref.texi 2009-12-29 12:59:18.000000000 -0800 ++++ doc/bashref.texi 2014-10-08 13:50:27.435414600 -0700 +@@ -4363,6 +4363,10 @@ If set, Bash + changes its behavior to that of version 3.1 with respect to quoted + arguments to the conditional command's =~ operator. + ++@item completion_strip_exe ++If set, whenever bash sees `foo.exe' during completion, it checks if ++`foo' is the same file and strips the suffix. ++ + @item dirspell + If set, Bash + attempts spelling correction on directory names during word completion +@@ -4892,6 +4896,14 @@ emacs shell buffer and disables line edi + The numeric effective user id of the current user. This variable + is readonly. + ++@item EXECIGNORE ++A colon-separated list of extended glob ((@pxref{Pattern Matching}) ++patterns. Files with full paths matching one of these patterns are ++not considered executable for the purposes of completion and PATH ++searching, but the @code{[}, @code{[[}, and @code{test} builtins are ++not affected. Use this variable to deal with systems that set the ++executable bit on files that are not actually executable. ++ + @item FCEDIT + The editor used as a default by the @option{-e} option to the @code{fc} + builtin command. +--- doc/builtins.1 2008-08-12 06:24:40.000000000 -0700 ++++ doc/builtins.1 2014-10-08 13:50:27.435414600 -0700 +@@ -12,6 +12,6 @@ shift, shopt, source, suspend, test, tim + ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1) + .SH BASH BUILTIN COMMANDS + .nr zZ 1 +-.so bash.1 ++.so man1/bash.1 + .SH SEE ALSO + bash(1), sh(1) +--- execute_cmd.c 2009-12-30 09:55:37.000000000 -0800 ++++ execute_cmd.c 2014-10-08 13:50:27.435414600 -0700 +@@ -4004,7 +4004,7 @@ execute_function (var, words, flags, fds + char *debug_trap, *error_trap, *return_trap; + #if defined (ARRAY_VARS) + SHELL_VAR *funcname_v, *nfv, *bash_source_v, *bash_lineno_v; +- ARRAY *funcname_a, *bash_source_a, *bash_lineno_a; ++ ARRAY *funcname_a, *volatile bash_source_a, *volatile bash_lineno_a; + #endif + FUNCTION_DEF *shell_fn; + char *sfile, *t; +@@ -4571,6 +4571,12 @@ execute_disk_command (words, redirects, + hookf = find_function (NOTFOUND_HOOK); + if (hookf == 0) + { ++#if __CYGWIN__ ++ /* Point out \r use to clueless users. The memory leak ++ is harmless - we're about to exit. */ ++ if (ansic_shouldquote (pathname)) ++ pathname = ansic_quote (pathname, 0, NULL); ++#endif /* __CYGWIN__ */ + internal_error (_("%s: command not found"), pathname); + exit (EX_NOTFOUND); /* Posix.2 says the exit status is 127 */ + } +@@ -4990,6 +4996,10 @@ do_piping (pipe_in, pipe_out) + dup_error (pipe_in, 0); + if (pipe_in > 0) + close (pipe_in); ++#if __CYGWIN__ ++ /* Let stdio know that fd may have changed from text to binary. */ ++ freopen (NULL, "r", stdin); ++#endif /* __CYGWIN__ */ + } + if (pipe_out != NO_PIPE) + { +@@ -5005,5 +5015,12 @@ do_piping (pipe_in, pipe_out) + if (dup2 (1, 2) < 0) + dup_error (1, 2); + } ++#if __CYGWIN__ ++ extern int sh_setlinebuf (FILE *); ++ /* Let stdio know that fd may have changed from text to binary. */ ++ freopen (NULL, "w", stdout); ++ /* Bash builtins (foolishly) rely on line-buffering. */ ++ sh_setlinebuf (stdout); ++#endif /* __CYGWIN__ */ + } + } +--- findcmd.c 2009-06-05 13:25:38.000000000 -0700 ++++ findcmd.c 2014-10-08 13:50:27.451015900 -0700 +@@ -43,6 +43,8 @@ + #include "hashcmd.h" + #include "findcmd.h" /* matching prototypes and declarations */ + ++#include ++ + extern int posixly_correct; + + /* Static functions defined and used in this file. */ +@@ -71,6 +73,38 @@ int check_hashed_filenames; + containing the file of interest. */ + int dot_found_in_search = 0; + ++static struct ignorevar execignore = ++{ ++ "EXECIGNORE", ++ (struct ign *)0, ++ 0, ++ (char *)0, ++ (sh_iv_item_func_t *)0, ++}; ++ ++void ++setup_exec_ignore (char *varname) ++{ ++ setup_ignore_patterns (&execignore); ++} ++ ++/* Return whether we should never consider file executable ++ * even if the system tells us it is. */ ++static int ++is_on_exec_blacklist (char *name) ++{ ++ struct ign *p; ++ int flags = FNM_EXTMATCH | FNM_CASEFOLD; ++ ++ for (p = execignore.ignores; p && p->val; p++) ++ { ++ if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH) ++ return (1); ++ } ++ ++ return (0); ++} ++ + /* Return some flags based on information about this file. + The EXISTS bit is non-zero if the file is found. + The EXECABLE bit is non-zero the file is executble. +@@ -98,7 +132,7 @@ file_status (name) + file access mechanisms into account. eaccess uses the effective + user and group IDs, not the real ones. We could use sh_eaccess, + but we don't want any special treatment for /dev/fd. */ +- if (eaccess (name, X_OK) == 0) ++ if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0) + r |= FS_EXECABLE; + if (eaccess (name, R_OK) == 0) + r |= FS_READABLE; +--- findcmd.h 2009-01-04 11:32:29.000000000 -0800 ++++ findcmd.h 2014-10-08 13:50:27.451015900 -0700 +@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons + extern char *find_path_file __P((const char *)); + extern char *search_for_command __P((const char *)); + extern char *user_command_matches __P((const char *, int, int)); ++extern void setup_exec_ignore __P((char *)); + + #endif /* _FINDCMD_H_ */ +--- general.c 2009-11-28 18:44:46.000000000 -0800 ++++ general.c 2014-10-08 13:50:27.451015900 -0700 +@@ -43,6 +43,10 @@ + + #include + ++#ifdef __CYGWIN__ ++#include ++#endif ++ + #if !defined (errno) + extern int errno; + #endif /* !errno */ +@@ -601,7 +605,8 @@ make_absolute (string, dot_path) + { + char pathbuf[PATH_MAX + 1]; + +- cygwin_conv_to_full_posix_path (string, pathbuf); ++ cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf, ++ PATH_MAX + 1); + result = savestring (pathbuf); + } + #else +--- input.c 2009-01-04 11:32:29.000000000 -0800 ++++ input.c 2014-10-08 13:50:27.451015900 -0700 +@@ -43,6 +43,10 @@ + #include "externs.h" + #include "quit.h" + ++#if __CYGWIN__ ++int igncr; ++#endif /* __CYGWIN__ */ ++ + #if !defined (errno) + extern int errno; + #endif /* !errno */ +@@ -193,6 +197,10 @@ make_buffered_stream (fd, buffer, bufsiz + bp->b_used = bp->b_inputp = bp->b_flag = 0; + if (bufsize == 1) + bp->b_flag |= B_UNBUFF; ++#if __CYGWIN__ ++ if ((fcntl (fd, F_GETFL) & O_TEXT) != 0) ++ bp->b_flag |= B_TEXT; ++#endif /* __CYGWIN__ */ + return (bp); + } + +@@ -361,11 +369,7 @@ duplicate_buffered_stream (fd1, fd2) + } + + /* Return 1 if a seek on FD will succeed. */ +-#ifndef __CYGWIN__ + # define fd_is_seekable(fd) (lseek ((fd), 0L, SEEK_CUR) >= 0) +-#else +-# define fd_is_seekable(fd) 0 +-#endif /* __CYGWIN__ */ + + /* Take FD, a file descriptor, and create and return a buffered stream + corresponding to it. If something is wrong and the file descriptor +@@ -474,6 +478,25 @@ b_fill_buffer (bp) + ssize_t nr; + + CHECK_TERMSIG; ++#ifdef __CYGWIN__ ++ /* lseek'ing on text files is problematic; lseek reports the true ++ file offset, but read collapses \r\n and returns a character ++ count. We cannot reliably seek backwards if nr is smaller than ++ the seek offset encountered during the read, and must instead ++ treat the stream as unbuffered. */ ++ if ((bp->b_flag & (B_TEXT | B_UNBUFF)) == B_TEXT) ++ { ++ off_t offset = lseek (bp->b_fd, 0, SEEK_CUR); ++ nr = zread (bp->b_fd, bp->b_buffer, bp->b_size); ++ if (nr > 0 && nr < lseek (bp->b_fd, 0, SEEK_CUR) - offset) ++ { ++ lseek (bp->b_fd, offset, SEEK_SET); ++ bp->b_flag |= B_UNBUFF; ++ nr = zread (bp->b_fd, bp->b_buffer, bp->b_size = 1); ++ } ++ } ++ else ++#endif /* __CYGWIN__ */ + nr = zread (bp->b_fd, bp->b_buffer, bp->b_size); + if (nr <= 0) + { +@@ -486,15 +509,6 @@ b_fill_buffer (bp) + return (EOF); + } + +-#if defined (__CYGWIN__) +- /* If on cygwin, translate \r\n to \n. */ +- if (nr >= 2 && bp->b_buffer[nr - 2] == '\r' && bp->b_buffer[nr - 1] == '\n') +- { +- bp->b_buffer[nr - 2] = '\n'; +- nr--; +- } +-#endif +- + bp->b_used = nr; + bp->b_inputp = 0; + return (bp->b_buffer[bp->b_inputp++] & 0xFF); +@@ -543,6 +557,19 @@ buffered_getchar () + { + CHECK_TERMSIG; + ++#if __CYGWIN__ ++ /* shopt igncr means to discard carriage returns from input stream. ++ If cr is the only character in the buffer, then recurse to pick ++ up the next character; otherwise flatten the buffer. */ ++ if (igncr) ++ { ++ int ch; ++ while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd])) ++ == '\r') ++ ; ++ return ch; ++ } ++#endif /* __CYGWIN__ */ + #if !defined (DJGPP) + return (bufstream_getc (buffers[bash_input.location.buffered_fd])); + #else +--- input.h 2009-01-04 11:32:29.000000000 -0800 ++++ input.h 2014-10-08 13:50:27.451015900 -0700 +@@ -48,6 +48,7 @@ enum stream_type {st_none, st_stdin, st_ + #define B_ERROR 0x02 + #define B_UNBUFF 0x04 + #define B_WASBASHINPUT 0x08 ++#define B_TEXT 0x10 /* Text stream, when O_BINARY is nonzero */ + + /* A buffered stream. Like a FILE *, but with our own buffering and + synchronization. Look in input.c for the implementation. */ +--- lib/sh/pathcanon.c 2008-08-12 11:01:37.000000000 -0700 ++++ lib/sh/pathcanon.c 2014-10-08 13:50:27.451015900 -0700 +@@ -194,6 +194,8 @@ sh_canonpath (path, flags) + *q++ = DIRSEP; + while (*p && (ISDIRSEP(*p) == 0)) + *q++ = *p++; ++ } ++ } + /* Check here for a valid directory with _path_isdir. */ + if (flags & PATH_CHECKEXISTS) + { +@@ -211,8 +213,7 @@ sh_canonpath (path, flags) + } + *q = c; + } +- } +- } ++ + + /* Empty string is really ``.'' or `/', depending on what we started with. */ + if (q == result) +--- lib/sh/pathphys.c 2008-08-12 11:01:23.000000000 -0700 ++++ lib/sh/pathphys.c 2014-10-08 13:50:27.451015900 -0700 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include "shell.h" + +@@ -76,6 +77,10 @@ sh_physpath (path, flags) + char *path; + int flags; + { ++#if __CYGWIN__ ++ /* realpath does this right without all the hassle */ ++ return realpath (path, NULL); ++#else + char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1]; + char *result, *p, *q, *qsave, *qbase, *workpath; + int double_slash_path, linklen, nlink; +@@ -249,6 +254,7 @@ error: + } + + return (result); ++#endif /* !__CYGWIN__ */ + } + + char * +--- lib/sh/tmpfile.c 2008-08-12 10:50:12.000000000 -0700 ++++ lib/sh/tmpfile.c 2014-10-08 13:50:27.451015900 -0700 +@@ -40,7 +40,7 @@ + extern int errno; + #endif + +-#define BASEOPENFLAGS (O_CREAT | O_TRUNC | O_EXCL) ++#define BASEOPENFLAGS (O_CREAT | O_TRUNC | O_EXCL | O_BINARY) + + #define DEFAULT_TMPDIR "." /* bogus default, should be changed */ + #define DEFAULT_NAMEROOT "shtmp" +@@ -94,7 +94,7 @@ get_tmpdir (flags) + if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX)) + tdir = 0; + +- if (tdir == 0) ++ if (tdir == 0 || !file_iswdir (tdir)) + tdir = get_sys_tmpdir (); + + #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX) +@@ -116,14 +116,15 @@ sh_mktmpname (nameroot, flags) + struct stat sb; + int r, tdlen; + +- filename = (char *)xmalloc (PATH_MAX + 1); ++ filename = NULL; + tdir = get_tmpdir (flags); + tdlen = strlen (tdir); + + lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; + + #ifdef USE_MKTEMP +- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); ++ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) ++ return NULL; + if (mktemp (filename) == 0) + { + free (filename); +@@ -136,7 +137,9 @@ sh_mktmpname (nameroot, flags) + (unsigned long) time ((time_t *)0) ^ + (unsigned long) dollar_dollar_pid ^ + (unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++); +- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); ++ free (filename); ++ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) ++ return NULL; + if (tmpnamelen > 0 && tmpnamelen < 32) + filename[tdlen + 1 + tmpnamelen] = '\0'; + # ifdef HAVE_LSTAT +@@ -161,14 +164,19 @@ sh_mktmpfd (nameroot, flags, namep) + char *filename, *tdir, *lroot; + int fd, tdlen; + +- filename = (char *)xmalloc (PATH_MAX + 1); ++ filename = NULL; + tdir = get_tmpdir (flags); + tdlen = strlen (tdir); + + lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; + + #ifdef USE_MKSTEMP +- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); ++ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) ++ { ++ if (namep) ++ *namep = NULL; ++ return -1; ++ } + fd = mkstemp (filename); + if (fd < 0 || namep == 0) + { +@@ -185,7 +193,13 @@ sh_mktmpfd (nameroot, flags, namep) + (unsigned long) time ((time_t *)0) ^ + (unsigned long) dollar_dollar_pid ^ + (unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++); +- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); ++ free (filename); ++ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) ++ { ++ if (namep) ++ *namep = NULL; ++ return -1; ++ } + if (tmpnamelen > 0 && tmpnamelen < 32) + filename[tdlen + 1 + tmpnamelen] = '\0'; + fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600); +--- parse.y 2014-10-08 13:45:10.394563700 -0700 ++++ parse.y 2014-10-08 13:50:27.451015900 -0700 +@@ -1520,14 +1520,20 @@ yy_string_get () + string = bash_input.location.string; + + /* If the string doesn't exist, or is empty, EOF found. */ +- if (string && *string) ++ while (string && *string) + { + c = *string++; + bash_input.location.string = string; ++#if __CYGWIN__ ++ { ++ extern int igncr; ++ if (igncr && c == '\r') ++ continue; ++ } ++#endif /* __CYGWIN__ */ + return (c); + } +- else +- return (EOF); ++ return (EOF); + } + + static int +@@ -5487,6 +5493,15 @@ report_syntax_error (message) + parser's complaining about by looking at current_token. */ + if (current_token != 0 && EOF_Reached == 0 && (msg = error_token_from_token (current_token))) + { ++#if __CYGWIN__ ++ /* Try to help clueless users. */ ++ char *p = msg; ++ if (ansic_shouldquote (msg)) ++ { ++ msg = ansic_quote (msg, 0, NULL); ++ free (p); ++ } ++#endif /* __CYGWIN__ */ + parser_error (line_number, _("syntax error near unexpected token `%s'"), msg); + free (msg); + +--- pathexp.h 2009-01-04 11:32:40.000000000 -0800 ++++ pathexp.h 2014-10-08 13:50:27.451015900 -0700 +@@ -86,7 +86,7 @@ struct ign { + typedef int sh_iv_item_func_t __P((struct ign *)); + + struct ignorevar { +- char *varname; /* FIGNORE or GLOBIGNORE */ ++ char *varname; /* FIGNORE or GLOBIGNORE or EXECIGNORE */ + struct ign *ignores; /* Store the ignore strings here */ + int num_ignores; /* How many are there? */ + char *last_ignoreval; /* Last value of variable - cached for speed */ +--- redir.c 2009-09-17 07:04:18.000000000 -0700 ++++ redir.c 2014-10-08 13:50:27.451015900 -0700 +@@ -437,7 +437,7 @@ here_document_to_fd (redirectee, ri) + /* In an attempt to avoid races, we close the first fd only after opening + the second. */ + /* Make the document really temporary. Also make it the input. */ +- fd2 = open (filename, O_RDONLY, 0600); ++ fd2 = open (filename, O_RDONLY | O_BINARY, 0600); + + if (fd2 < 0) + { +@@ -453,14 +453,6 @@ here_document_to_fd (redirectee, ri) + if (unlink (filename) < 0) + { + r = errno; +-#if defined (__CYGWIN__) +- /* Under CygWin 1.1.0, the unlink will fail if the file is +- open. This hack will allow the previous action of silently +- ignoring the error, but will still leave the file there. This +- needs some kind of magic. */ +- if (r == EACCES) +- return (fd2); +-#endif /* __CYGWIN__ */ + close (fd2); + free (filename); + errno = r; +--- shell.c 2009-11-19 07:05:54.000000000 -0800 ++++ shell.c 2014-10-08 13:50:27.466607600 -0700 +@@ -329,7 +329,10 @@ _cygwin32_check_tmp () + struct stat sb; + + if (stat ("/tmp", &sb) < 0) +- internal_warning (_("could not find /tmp, please create!")); ++ { ++ if (mkdir ("/tmp", S_IRWXU | S_IRWXG | S_IRWXO | S_ISVTX) != 0) ++ internal_warning (_("could not find /tmp, please create!")); ++ } + else + { + if (S_ISDIR (sb.st_mode) == 0) +@@ -1471,10 +1474,6 @@ open_shell_script (script_name) + not match with ours. */ + fd = move_to_high_fd (fd, 1, -1); + +-#if defined (__CYGWIN__) && defined (O_TEXT) +- setmode (fd, O_TEXT); +-#endif +- + #if defined (BUFFERED_INPUT) + default_buffered_input = fd; + SET_CLOSE_ON_EXEC (default_buffered_input); +--- subst.c 2009-12-30 05:24:28.000000000 -0800 ++++ subst.c 2014-10-08 13:50:27.466607600 -0700 +@@ -4921,10 +4921,6 @@ read_comsub (fd, quoted, rflag) + for (skip_ctlesc = skip_ctlnul = 0, s = ifs_value; s && *s; s++) + skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL; + +-#ifdef __CYGWIN__ +- setmode (fd, O_TEXT); /* we don't want CR/LF, we want Unix-style */ +-#endif +- + /* Read the output of the command through the pipe. This may need to be + changed to understand multibyte characters in the future. */ + while (1) +@@ -4947,6 +4943,13 @@ read_comsub (fd, quoted, rflag) + #endif + continue; + } ++#if __CYGWIN__ ++ { ++ extern int igncr; ++ if (igncr && c == '\r') ++ continue; ++ } ++#endif /* __CYGWIN__ */ + + /* Add the character to ISTRING, possibly after resizing it. */ + RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE); +@@ -5063,6 +5066,27 @@ command_substitute (string, quoted) + sys_error (_("cannot make pipe for command substitution")); + goto error_exit; + } ++#if __CYGWIN__ ++ /* Passing a pipe through std fds can cause hangs when talking to a ++ non-cygwin child. Move it. */ ++ if (fildes[0] < 3) ++ { ++ int fd = fcntl (fildes[0], F_DUPFD, 3); ++ close (fildes[0]); ++ fildes[0] = fd; ++ } ++ if (fildes[1] < 3) ++ { ++ int fd = fcntl (fildes[1], F_DUPFD, 3); ++ close (fildes[1]); ++ fildes[1] = fd; ++ } ++ if (fildes[0] < 0 || fildes[1] < 0) ++ { ++ sys_error (_("cannot make pipe for command substitution")); ++ goto error_exit; ++ } ++#endif /* __CYGWIN__ */ + + old_pid = last_made_pid; + #if defined (JOB_CONTROL) +@@ -5130,6 +5154,12 @@ command_substitute (string, quoted) + (fildes[0] != fileno (stdout)) && + (fildes[0] != fileno (stderr))) + close (fildes[0]); ++#if __CYGWIN__ ++ /* Inform stdio if any text/binary changes happened. */ ++ freopen (NULL, "w", stdout); ++ /* Bash builtins (foolishly) rely on line-buffering. */ ++ sh_setlinebuf (stdout); ++#endif /* __CYGWIN__ */ + + /* The currently executing shell is not interactive. */ + interactive = 0; +--- variables.c 2014-10-08 13:45:10.285364600 -0700 ++++ variables.c 2014-10-08 13:50:27.466607600 -0700 +@@ -4143,6 +4143,8 @@ static struct name_and_function special_ + { "COMP_WORDBREAKS", sv_comp_wordbreaks }, + #endif + ++ { "EXECIGNORE", sv_execignore }, ++ + { "GLOBIGNORE", sv_globignore }, + + #if defined (HISTORY) +@@ -4323,6 +4325,13 @@ sv_globignore (name) + setup_glob_ignore (name); + } + ++/* What to do when EXECIGNORE changes. */ ++void ++sv_execignore (char *name) ++{ ++ setup_exec_ignore (name); ++} ++ + #if defined (READLINE) + void + sv_comp_wordbreaks (name) +--- variables.h 2009-08-16 13:10:15.000000000 -0700 ++++ variables.h 2014-10-08 13:50:27.466607600 -0700 +@@ -351,6 +351,7 @@ extern void sv_ifs __P((char *)); + extern void sv_path __P((char *)); + extern void sv_mail __P((char *)); + extern void sv_globignore __P((char *)); ++extern void sv_execignore __P((char *)); + extern void sv_ignoreeof __P((char *)); + extern void sv_strict_posix __P((char *)); + extern void sv_optind __P((char *)); diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index af51ab4e7665..8774db33b5ab 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -3,8 +3,21 @@ assert interactive -> readline != null; let - realName = "bash-4.3"; + version = if stdenv.isCygwin then "4.1" else "4.3"; + realName = "bash-${version}"; + shortName = if stdenv.isCygwin then "bash41" else "bash43"; baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; + sha256 = if version == "4.1" then + "1np1ggp1lv8idwfx3mcxl9rhadqdf4h3x4isa3dk8v9wm0j72qiz" + else + "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; + + basePatchFun = if version == "4.1" then + ./bash-4.1-patches.nix + else + ./bash-4.3-patches.nix; + + extraPatches = stdenv.lib.optional stdenv.isCygwin ./bash-4.1.17-9.src.patch; in stdenv.mkDerivation rec { @@ -12,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/bash/${realName}.tar.gz"; - sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; + inherit sha256; }; NIX_CFLAGS_COMPILE = '' @@ -30,11 +43,11 @@ stdenv.mkDerivation rec { (let patch = nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-4.3-patches/bash43-${nr}"; + url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}"; inherit sha256; }; in - import ./bash-4.3-patches.nix patch); + import basePatchFun patch) ++ extraPatches; crossAttrs = { configureFlags = baseConfigureFlags + From 3f6949c3ef358f28b5f90d9766c33aed8a78a9de Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Thu, 23 Oct 2014 16:28:20 +0200 Subject: [PATCH 027/127] cygwin: openssl for x86_64 --- .../libraries/openssl/1.0.1-cygwin64.patch | 136 ++++++++++++++++++ .../development/libraries/openssl/default.nix | 12 +- 2 files changed, 142 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/openssl/1.0.1-cygwin64.patch diff --git a/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch b/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch new file mode 100644 index 000000000000..63112abf3a39 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch @@ -0,0 +1,136 @@ +--- openssl-1.0.1e/config 2014-10-23 15:53:23.436600000 +0200 ++++ openssl-1.0.1e/config 2014-10-23 15:55:33.837000000 +0200 +@@ -832,6 +832,7 @@ + # these are all covered by the catchall below + # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; ++ x86_64-*-cygwin) OUT="Cygwin-x86_64" ;; + *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;; + *-*-cygwin) OUT="Cygwin" ;; + t3e-cray-unicosmk) OUT="cray-t3e" ;; +--- openssl-1.0.1e/Configure 2013-02-17 17:06:18.682058900 -0600 ++++ openssl-1.0.1e/Configure 2013-02-17 16:38:08.000000000 -0600 +@@ -550,6 +550,7 @@ my %table=( + "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", + "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", + "debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", ++"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", + + # NetWare from David Ward (dsward@novell.com) + # requires either MetroWerks NLM development tools, or gcc / nlmconv +@@ -1128,7 +1129,7 @@ foreach (sort @experimental) + + my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; + +-$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); ++$exe_ext=".exe" if ($target =~ /^Cygwin/ || $target eq "DJGPP" || $target =~ /^mingw/); + $exe_ext=".nlm" if ($target =~ /netware/); + $exe_ext=".pm" if ($target =~ /vos/); + $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); +--- openssl-1.0.1e/Makefile.org 2013-02-11 09:26:04.000000000 -0600 ++++ openssl-1.0.1e/Makefile.org 2013-02-17 16:38:08.000000000 -0600 +@@ -326,9 +326,9 @@ clean-shared: + done; \ + fi; \ + ( set -x; rm -f lib$$i$(SHLIB_EXT) ); \ +- if [ "$(PLATFORM)" = "Cygwin" ]; then \ ++ case "$(PLATFORM)" in Cygwin*) \ + ( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \ +- fi; \ ++ esac; \ + done + + link-shared: +@@ -571,11 +571,7 @@ install_sw: + do \ + if [ -f "$$i" -o -f "$$i.a" ]; then \ + ( echo installing $$i; \ +- if [ "$(PLATFORM)" != "Cygwin" ]; then \ +- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ +- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ +- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ +- else \ ++ case "$(PLATFORM)" in Cygwin*) \ + c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ + cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ + chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ +@@ -583,7 +579,12 @@ install_sw: + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ +- fi ); \ ++ ;; \ ++ *) \ ++ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ ++ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ ++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ ++ esac ); \ + if expr $(PLATFORM) : 'mingw' > /dev/null; then \ + ( case $$i in \ + *crypto*) i=libeay32.dll;; \ +@@ -643,9 +644,9 @@ install_docs: + @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ + here="`pwd`"; \ + filecase=; \ +- if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \ ++ case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \ + filecase=-i; \ +- fi; \ ++ esac; \ + set -e; for i in doc/apps/*.pod; do \ + fn=`basename $$i .pod`; \ + sec=`$(PERL) util/extract-section.pl 1 < $$i`; \ +--- openssl-1.0.1e/engines/ccgost/Makefile 2013-02-11 09:26:04.000000000 -0600 ++++ openssl-1.0.1e/engines/ccgost/Makefile 2013-02-17 17:05:47.759290200 -0600 +@@ -45,7 +45,11 @@ install: + set -e; \ + echo installing $(LIBNAME); \ + pfx=lib; \ +- if [ "$(PLATFORM)" != "Cygwin" ]; then \ ++ case "$(PLATFORM)" in Cygwin*) \ ++ sfx=".so"; \ ++ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ ++ ;; \ ++ *) \ + case "$(CFLAGS)" in \ + *DSO_BEOS*) sfx=".so";; \ + *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \ +@@ -54,10 +58,7 @@ install: + *) sfx=".bad";; \ + esac; \ + cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ +- else \ +- sfx=".so"; \ +- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ +- fi; \ ++ esac; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ + fi +--- openssl-1.0.1i/engines/Makefile 2014-10-23 16:08:19.360200000 +0200 ++++ openssl-1.0.1i/engines/Makefile 2014-10-23 16:10:54.205800000 +0200 +@@ -111,7 +111,11 @@ + for l in $(LIBNAMES); do \ + ( echo installing $$l; \ + pfx=lib; \ +- if [ "$(PLATFORM)" != "Cygwin" ]; then \ ++ case "$(PLATFORM)" in Cygwin*) \ ++ sfx=".so"; \ ++ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ ++ ;; \ ++ *) \ + case "$(CFLAGS)" in \ + *DSO_BEOS*) sfx=".so";; \ + *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \ +@@ -120,10 +124,7 @@ + *) sfx=".bad";; \ + esac; \ + cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ +- else \ +- sfx=".so"; \ +- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ +- fi; \ ++ esac; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ + done; \ diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 7255e91f282d..7f428fd584b9 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -35,6 +35,7 @@ let ++ stdenv.lib.optional isDarwin ./darwin-arch.patch; + extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch; in stdenv.mkDerivation { @@ -48,7 +49,7 @@ stdenv.mkDerivation { sha256 = "0x7gvyybmqm4lv62mlhlm80f1rn7il2qh8224rahqv0i15xhnpq9"; }; - patches = patchesCross false; + patches = (patchesCross false) ++ extraPatches; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; @@ -62,12 +63,11 @@ stdenv.mkDerivation { else "./config"; configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + - stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" + - stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm"; + stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; - preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") '' - sed -i -e "s|-march=i486|-march=x86-64|g" Makefile - ''; + # CYGXXX: used to be set for cygwin with optionalString. Not needed + # anymore but kept to prevent rebuild. + preBuild = ""; makeFlags = "MANDIR=$(out)/share/man"; From 221b5a5be5eb698c696b728b0a9b6646422cd9c7 Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Thu, 16 Oct 2014 22:06:51 +0200 Subject: [PATCH 028/127] cygwin: findutils fpending and coreutils patch --- .../coreutils/coreutils-8.23-4.cygwin.patch | 1259 +++++++++++++++++ pkgs/tools/misc/coreutils/default.nix | 4 + pkgs/tools/misc/findutils/default.nix | 4 + 3 files changed, 1267 insertions(+) create mode 100644 pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch diff --git a/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch b/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch new file mode 100644 index 000000000000..2f69347ffabd --- /dev/null +++ b/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch @@ -0,0 +1,1259 @@ +--- coreutils-8.23/ChangeLog 2014-07-18 15:22:24.000000000 -0700 ++++ coreutils-8.23/ChangeLog 2014-10-13 08:56:50.775188900 -0700 +@@ -1,3 +1,220 @@ ++2014-10-13 U-WIN-RSJ0SJPBR3E\Administrator ++ ++ Cygwin release 8.23-4 ++ * copy.c (copy_internal): Fix typo that broke recursive copy ++ when dealing with directories. ++ ++2014-09-24 Eric Blake ++ ++ Cygwin release 8.23-3 ++ * lib/cygwin.c (cygwin_spelling): Skip .exe magic if .exe is ++ already present. Also honor .exe magic on symlinks. ++ * lib/same.c (same_name): Treat files as same if only difference ++ is .exe magic. ++ * copy.c (copy): Move symlink special casing here. ++ * install.c (strip): Update caller. ++ * ls.c (gobble_file): Likewise. ++ * stat.c (do_statfs, do_stat): Likewise. ++ ++2014-08-12 Eric Blake ++ ++ Cygwin release 8.23-2. ++ Drop hostname. ++ ++2014-08-01 Eric Blake ++ ++ Cygwin release 8.23-1. ++ * configure.ac: Disable stdbuf. ++ * lib/local.mk: Upstream switched to flat make, impacting how ++ we build local cygwin.c code. ++ * lib/canonicalize.c: Accepted upstream. ++ * lib/file-has-acl.c: Likewise. ++ * realpath.c: Likewise. ++ * su.c: Upstream dropped su. ++ * Makefile.am: Drop su changes. ++ * chroot.c: Adapt to new upstream code. ++ ++2012-02-04 Eric Blake ++ ++ Cygwin release 8.15-1. ++ * lib/fts.c: Early gnulib fix is now upstream. ++ * lib/canonicalize.c: Backport gnulib fix for /// -> /. ++ * realpath.c: Backport gnulib fix for --relative-to. ++ ++2011-10-27 Eric Blake ++ ++ Cygwin release 8.14-1. ++ * lib/ftc.c: Backport gnulib fix to make rm close before rmdir. ++ * lib/cygwin.c (cygwin_spelling): Fix logic when 'f' and 'f.exe' ++ exist but are different files. ++ * stat.c: Fix --append-exe. ++ ++2011-02-04 Eric Blake ++ ++ Cygwin release 8.10-1. ++ ++2010-12-24 Eric Blake ++ ++ Cygwin release 8.8-1. ++ * lib/mountlist.c (ME_REMOTE): Restore previous cygwin hack to ++ determine remote drives, lost since 6.11-1. ++ ++2010-04-29 Eric Blake ++ ++ Cygwin release 8.5-1. ++ ++2010-03-11 Eric Blake ++ ++ Cygwin release 8.4-1. ++ * lib/xfreopen.c (xfreopen): Consolidate workaround for broken ++ freopen usage into one place. ++ * copy.c (copy): Reinstate .exe magic handling when copying ++ files with implicit .exe. ++ ++2008-12-13 Eric Blake ++ ++ Cygwin release 7.0-1. ++ ++2008-06-02 Eric Blake ++ ++ Cygwin release 6.12-1. ++ ++2008-05-12 Eric Blake ++ ++ Cygwin release 6.11-1, requires cygwin 1.7.0. ++ * lib/cygwin.h (CYGWIN_APPEND_EXE): Accomodate new PATH_MAX. ++ * lib/cygwin.c (cygwin_spelling): Accomodate new trailing ++ `.' semantics. ++ * lib/same.c (same_name): Accomodate new PATH_MAX. ++ ++2008-01-24 Eric Blake ++ ++ Cygwin release 6.10-1. ++ * lib/hash-triple.c (triple_hash): Hash case-insensitively. ++ * lib/hash-pjw.h (hash_pjw_case): New interface. ++ * lib/hash-pjw.c (hash_pjw_case): New function. ++ * chcon.c (main): Support my root_dev_ino tweaks. ++ ++2007-08-21 Eric Blake ++ ++ Cygwin release 6.9-5. ++ * same.c (same_name): Detect same file differing only by case. ++ * copy.c (same_file_ok): Add parameter to detect when case ++ change is being attempted. ++ (triple_hash): Hash names case-insensitively. ++ (copy_internal): Accommodate case-change attempts. ++ * mv.c (do_move): Allow 'mv foo/ Foo/' as shorthand for ++ 'mv -T foo/ Foo/'. ++ ++2007-07-23 Eric Blake ++ ++ Cygwin release 6.9-4. ++ * dd.c (main): Fix typo in earlier cygwin patch. ++ ++2007-05-29 Eric Blake ++ ++ Cygwin release 6.9-3. ++ * cksum.c (main): Don't lose append mode. ++ * md5sum.c (main): Likewise. ++ * cat.c (main): Likewise. ++ * head.c (main): Likewise. ++ * tac.c (main): Likewise. ++ * tail.c (main): Likewise. ++ * tee.c (main): Likewise. ++ * tr.c (main): Likewise. ++ ++2006-11-24 Eric Blake ++ ++ Cygwin release 6.6-2. ++ * lib/cygwin.c (cygwin_spelling): Work even with old-style ++ symlinks, which lacked .lnk suffix. ++ ++2006-04-14 Eric Blake ++ ++ Cygwin release 5.94-5. Experimental only, depends on cygwin ++ snapshot 20060329 or later. ++ * dd.c (main): Default to binary mode. ++ * system.h (rpl_freopen): Remove this hack, now that cygwin ++ freopen(NULL) works. ++ * lib/quotearg.c (quote_eight_bit): New variable, so I can... ++ (quotearg_buffer_restyled): treat 8-bit characters as printable ++ when outputting to a terminal. ++ * lib/quote.c (quote_n): Use it. ++ ++2006-02-28 Eric Blake ++ ++ Cygwin release 5.94-4. Experimental only, depends on cygwin ++ snapshot 20060227 or later. ++ * lib/root-dev-ino.h (struct root_dev_ino): New struct. ++ (ROOT_DEV_INO_CHECK, ROOT_DEV_INO_WARN): Also track //. ++ * lib/root-dev-ino.c (get_root_dev_ino): Also track //. ++ * chmod.c (root_dev_ino): Use new type. ++ (main): Ditto. ++ * chown-core.h (struct Chown_option): Ditto. ++ * chown.c (main): Ditto. ++ * remove.h (struct rm_options): Ditto. ++ * rm.c (main): Ditto. ++ * pwd.c (robust_getcwd): Ditto. Also fix bug when in / or //. ++ ++2006-01-24 Eric Blake ++ ++ Cygwin release 5.93-3, depends on cygwin-1.5.19-1 or later. ++ * cksum.c (main): Always output binary files. ++ * md5sum.c (main): Likewise. ++ * su.c (correct_password): On NT machines, attempt ++ passwordless login first, and give better error message if ++ password check fails. I still don't know how to distinguish ++ between insufficient privileges vs. incorrect password. ++ * dircolors.c (main): Silence warning from tcsh 6.14.00. ++ ++2005-10-15 Eric Blake ++ ++ Cygwin release 5.90-3, depends on snapshot 20051003 or later (will ++ become cygwin 1.5.19). ++ * doc/coreutils.texi (ls invocation, stat invocation): Document ++ --append-exe. ++ * ls.c (usage): Ditto. ++ (gobble_file): Append .exe as needed when requested. ++ * stat.c (usage): Document --append-exe. ++ (do_stat, do_statfs): Append .exe as needed when requested. ++ ++2005-10-08 Eric Blake ++ ++ Cygwin release 5.90-2, depends on snapshot 20051003 or later (will ++ become cygwin 1.5.19). ++ * lib/mkdir-p.c (make_dir_parents): Fix bug in last patch. ++ * lib/cygwin.h (CYGWIN_APPEND_EXE): Factor into common macro. ++ * copy.c (copy): Use new macro. ++ * install.c (strip): Ditto. ++ * ln.c (do_link): Ditto. ++ ++2005-07-13 Eric Blake ++ ++ * doc/coreutils.texi (ln invocation): Document --disable-exe-magic. ++ * ln.c (usage): Likewise. ++ (do_link): Skip .exe magic when requested. ++ ++2005-07-12 Eric Blake ++ ++ * lib/cygwin.c (cygwin_spelling): Don't append .exe to directories. ++ Make sure .exe exists before returning 1, because otherwise ++ virtual directories such as /cygdrive have problems. ++ ++2005-07-07 Eric Blake ++ ++ * lib/cygwin.h: New file, defining cygwin_spelling. ++ * lib/cygwin.c: New file. ++ * lib/Makefile.am: Compile it. ++ * copy.c (copy_internal, copy): Use new cygwin_spelling() to ++ undo .exe magic. ++ * link.c (do_link): Likewise. ++ * install.c (strip): Likewise. ++ ++2005-01-03 Corinna Vinschen ++ ++ * install.c (strip): Check for .exe here since strip doesn't. ++ ++ + 2014-07-18 Pádraig Brady + + version 8.23 +--- coreutils-8.23/configure.ac 2014-07-17 18:40:57.000000000 -0700 ++++ coreutils-8.23/configure.ac 2014-10-13 08:30:37.165262300 -0700 +@@ -473,7 +473,7 @@ AC_COMPILE_IFELSE( + [stdbuf_supported=yes], + [stdbuf_supported=no]) + AC_MSG_RESULT([$stdbuf_supported]) +-if test "$stdbuf_supported" = "yes"; then ++if test "$stdbuf_supported" = "yes" && test -z "$EXEEXT"; then + gl_ADD_PROG([optional_bin_progs], [stdbuf]) + fi + +--- coreutils-8.23/doc/coreutils.texi 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/doc/coreutils.texi 2014-10-13 08:30:37.180881200 -0700 +@@ -7838,6 +7838,14 @@ These options change how file names them + + @table @samp + ++@item --append-exe ++@opindex --append-exe ++@cindex appending exe on cygwin ++Cygwin only: Cygwin normally performs @samp{.exe} magic, where a ++command line argument typed without an .exe extension transparently ++refers to the existing file with an extension. Specifying this option ++will make the .exe show if cygwin magic was involved. ++ + @item -b + @itemx --escape + @itemx --quoting-style=escape +@@ -11799,6 +11807,14 @@ With this option, @command{stat} acts on + by each symbolic link argument. + Without it, @command{stat} acts on any symbolic link argument directly. + ++@item --append-exe ++@opindex --append-exe ++@cindex appending exe on cygwin ++Cygwin only: Cygwin normally performs .exe magic, where a command line ++argument typed without an .exe extension transparently refers to the ++existing file with an extension. Specifying this option will make ++the .exe show if cygwin magic was involved. ++ + @item -f + @itemx --file-system + @opindex -f +--- coreutils-8.23/lib/cygwin.c 1969-12-31 16:00:00.000000000 -0800 ++++ coreutils-8.23/lib/cygwin.c 2014-10-13 08:30:37.180881200 -0700 +@@ -0,0 +1,67 @@ ++/* cygwin.c - helper functions unique to Cygwin ++ ++ Copyright (C) 2005, 2006, 2008, 2011 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software Foundation, ++ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++ Written by Eric Blake. */ ++ ++#include ++ ++#include "cygwin.h" ++ ++#include ++#include ++#include ++#include ++ ++/* Return -1 if PATH is not found, 0 if PATH will not have .exe ++ appended (it is possible that a PATH that does not exist still ++ returns 0 instead of -1, or fails for a PATH that exists but cannot ++ be stat'ed), and positive if PATH has ".exe" automatically appended ++ by cygwin (1 if PATH is a symlink, 2 otherwise). Won't change errno. */ ++ ++int ++cygwin_spelling (char const *path) ++{ ++ int saved_errno = errno; ++ int result = 0; /* Start with assumption that PATH is okay. */ ++ int len; ++ struct stat st1; ++ struct stat st2; ++ char *path_exe; ++ ++ if (! path || ! *path || len > PATH_MAX) ++ /* PATH will cause EINVAL or ENAMETOOLONG, treat it as non-existing. */ ++ return -1; ++ len = strlen (path); ++ if (path[len - 1] == '/' ++ || (len > 4 && !strcasecmp (&path[len - 4], ".exe"))) ++ /* Don't change spelling if there is a trailing `/' or '.exe'. */ ++ return 0; ++ if (lstat (path, &st1) < 0 || S_ISDIR(st1.st_mode)) ++ { ++ errno = saved_errno; ++ return -1; ++ } ++ path_exe = malloca (len + 5); /* adding ".exe" and NUL. */ ++ strcat (stpcpy (path_exe, path), ".exe"); ++ if (lstat (path_exe, &st2) == 0 && st1.st_ino == st2.st_ino) ++ result = 1 + !S_ISLNK(st1.st_mode); ++ freea (path_exe); ++ ++ errno = saved_errno; ++ return result; ++} +--- coreutils-8.23/lib/cygwin.h 1969-12-31 16:00:00.000000000 -0800 ++++ coreutils-8.23/lib/cygwin.h 2014-10-13 08:30:37.180881200 -0700 +@@ -0,0 +1,38 @@ ++/* cygwin.h - helper functions unique to Cygwin ++ ++ Copyright (C) 2005, 2006, 2008, 2010, 2011 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software Foundation, ++ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++ Written by Eric Blake. */ ++ ++#ifndef CYGWIN_H ++# define CYGWIN_H 1 ++ ++#include "malloca.h" ++ ++int cygwin_spelling (char const *); ++ ++/* Append ".exe" to char *__NAME_ORIG, where __NAME is either NULL or ++ between __NAME_ORIG and the nul terminator. Both params will be ++ evaluated more than once and assigned the new value. The user must ++ later call freea(__NAME). */ ++#define CYGWIN_APPEND_EXE(__name, __name_orig) \ ++ __name_orig = __name = \ ++ strcat (strcpy (malloca (strchr (__name ? __name : __name_orig, '\0') \ ++ - (__name_orig) + 5), \ ++ __name_orig), ".exe") ++ ++#endif /* CYGWIN_H */ +--- coreutils-8.23/lib/hash-pjw.c 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/hash-pjw.c 2014-10-13 08:30:37.180881200 -0700 +@@ -19,6 +19,7 @@ + + #include "hash-pjw.h" + ++#include + #include + + #define SIZE_BITS (sizeof (size_t) * CHAR_BIT) +@@ -38,3 +39,16 @@ hash_pjw (const void *x, size_t tablesiz + + return h % tablesize; + } ++ ++/* Likewise, but case-insensitive. */ ++size_t ++hash_pjw_case (const void *x, size_t tablesize) ++{ ++ const unsigned char *s; ++ size_t h = 0; ++ ++ for (s = x; *s; s++) ++ h = tolower (*s) + ((h << 9) | (h >> (SIZE_BITS - 9))); ++ ++ return h % tablesize; ++} +--- coreutils-8.23/lib/hash-pjw.h 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/hash-pjw.h 2014-10-13 08:30:37.180881200 -0700 +@@ -21,3 +21,4 @@ + The result is platform dependent: it depends on the size of the 'size_t' + type and on the signedness of the 'char' type. */ + extern size_t hash_pjw (void const *x, size_t tablesize) _GL_ATTRIBUTE_PURE; ++extern size_t hash_pjw_case (void const *x, size_t tablesize) _GL_ATTRIBUTE_PURE; +--- coreutils-8.23/lib/hash-triple.c 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/hash-triple.c 2014-10-13 08:30:37.180881200 -0700 +@@ -34,7 +34,13 @@ size_t + triple_hash (void const *x, size_t table_size) + { + struct F_triple const *p = x; ++#if !__CYGWIN__ + size_t tmp = hash_pjw (p->name, table_size); ++#else // cygwin ++ /* Hash case-insensitively, to force collisions on names that differ by ++ case; copy.c can then account for case-insensitive renames. */ ++ size_t tmp = hash_pjw_case (p->name, table_size); ++#endif + + /* Ignoring the device number here should be fine. */ + return (tmp ^ p->st_ino) % table_size; +--- coreutils-8.23/lib/local.mk 2013-12-04 06:48:30.000000000 -0800 ++++ coreutils-8.23/lib/local.mk 2014-10-13 08:30:37.180881200 -0700 +@@ -3,3 +3,6 @@ include lib/gnulib.mk + # Allow "make distdir" to succeed before "make all" has run. + dist-hook: $(noinst_LIBRARIES) + .PHONY: dist-hook ++ ++# Hook in cygwin helper ++lib_libcoreutils_a_SOURCES += lib/cygwin.c lib/cygwin.h +--- coreutils-8.23/lib/root-dev-ino.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/lib/root-dev-ino.c 2014-10-13 08:30:37.180881200 -0700 +@@ -25,13 +25,17 @@ + /* Call lstat to get the device and inode numbers for '/'. + Upon failure, return NULL. Otherwise, set the members of + *ROOT_D_I accordingly and return ROOT_D_I. */ +-struct dev_ino * +-get_root_dev_ino (struct dev_ino *root_d_i) ++struct root_dev_ino * ++get_root_dev_ino (struct root_dev_ino *root_d_i) + { + struct stat statbuf; + if (lstat ("/", &statbuf)) + return NULL; +- root_d_i->st_ino = statbuf.st_ino; +- root_d_i->st_dev = statbuf.st_dev; ++ root_d_i->single_slash.st_ino = statbuf.st_ino; ++ root_d_i->single_slash.st_dev = statbuf.st_dev; ++ if (lstat ("//", &statbuf)) ++ return NULL; ++ root_d_i->double_slash.st_ino = statbuf.st_ino; ++ root_d_i->double_slash.st_dev = statbuf.st_dev; + return root_d_i; + } +--- coreutils-8.23/lib/root-dev-ino.h 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/lib/root-dev-ino.h 2014-10-13 08:30:37.180881200 -0700 +@@ -21,19 +21,26 @@ + # include "dev-ino.h" + # include "same-inode.h" + +-struct dev_ino * +-get_root_dev_ino (struct dev_ino *root_d_i); ++struct root_dev_ino ++{ ++ struct dev_ino single_slash; ++ struct dev_ino double_slash; ++}; ++ ++struct root_dev_ino * ++get_root_dev_ino (struct root_dev_ino *root_d_i); + + /* These macros are common to the programs that support the + --preserve-root and --no-preserve-root options. */ + + # define ROOT_DEV_INO_CHECK(Root_dev_ino, Dir_statbuf) \ +- (Root_dev_ino && SAME_INODE (*Dir_statbuf, *Root_dev_ino)) ++ (Root_dev_ino && (SAME_INODE (*Dir_statbuf, (Root_dev_ino)->single_slash) \ ++ || SAME_INODE (*Dir_statbuf, (Root_dev_ino)->double_slash))) + + # define ROOT_DEV_INO_WARN(Dirname) \ + do \ + { \ +- if (STREQ (Dirname, "/")) \ ++ if (STREQ (Dirname, "/") || STREQ (Dirname, "//")) \ + error (0, 0, _("it is dangerous to operate recursively on %s"), \ + quote (Dirname)); \ + else \ +--- coreutils-8.23/lib/same.c 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/same.c 2014-10-13 08:30:37.180881200 -0700 +@@ -40,6 +40,13 @@ + #include "error.h" + #include "same-inode.h" + ++#if __CYGWIN__ ++# include ++# include "cygwin.h" ++# include "malloca.h" ++# include "memcasecmp.h" ++#endif ++ + #ifndef MIN + # define MIN(a, b) ((a) < (b) ? (a) : (b)) + #endif +@@ -59,6 +66,45 @@ same_name (const char *source, const cha + (source_baselen == dest_baselen + && memcmp (source_basename, dest_basename, dest_baselen) == 0); + bool compare_dirs = identical_basenames; ++#if __CYGWIN__ ++ /* If two names differ case-insensitively by only an '.exe' suffix, ++ do some sleuthing to see if .exe magic matters on the shorter ++ name. Swapping the longer name to dest avoids duplication. */ ++ if (source_baselen == dest_baselen + 4) ++ { ++ char const *tmp_basename = source_basename; ++ size_t tmp_baselen = source_baselen; ++ source_basename = dest_basename; ++ source_baselen = dest_baselen; ++ dest_basename = tmp_basename; ++ dest_baselen = tmp_baselen; ++ } ++ if (source_baselen + 4 == dest_baselen ++ && !memcasecmp (dest_basename - 4, ".exe", 4) ++ && !memcasecmp (source_basename, dest_basename, source_baselen) ++ && 0 < cygwin_spelling(source)) ++ dest_baselen -= 4; ++ /* Some, but not all, files are case-insensitive (depending on mount ++ options, CYGWIN=case settings, and virtual file systems). Do ++ some sleuthing to decide whether case-insensitivity matters. */ ++ if (! compare_dirs && source_baselen == dest_baselen) ++ { ++ ssize_t wsrclen = cygwin_conv_path (CCP_POSIX_TO_WIN_W, ++ source, NULL, 0); ++ ssize_t wdstlen = cygwin_conv_path (CCP_POSIX_TO_WIN_W, ++ dest, NULL, 0); ++ char *wsrc = malloca (wsrclen); ++ char *wdst = malloca (wdstlen); ++ if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, source, wsrc, wsrclen)) ++ error (EXIT_FAILURE, errno, "unable to convert path name %s", source); ++ if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, dest, wdst, wdstlen)) ++ error (EXIT_FAILURE, errno, "unable to convert path name %s", dest); ++ if (wsrclen == wdstlen && memcasecmp (wsrc, wdst, wsrclen) == 0) ++ compare_dirs = true; ++ freea (wsrc); ++ freea (wdst); ++ } ++#endif /* __CYGWIN__ */ + bool same = false; + + #if ! _POSIX_NO_TRUNC && HAVE_PATHCONF && defined _PC_NAME_MAX +--- coreutils-8.23/lib/xfreopen.c 2014-05-29 05:05:50.000000000 -0700 ++++ coreutils-8.23/lib/xfreopen.c 2014-10-13 08:30:37.180881200 -0700 +@@ -18,6 +18,7 @@ + #include "xfreopen.h" + + #include ++#include + #include "error.h" + #include "exitfail.h" + #include "quote.h" +@@ -26,9 +27,17 @@ + #include "gettext.h" + #define _(msgid) gettext (msgid) + ++#define STREQ(s1, s2) (strcmp (s1, s2) == 0) ++ + void + xfreopen (char const *filename, char const *mode, FILE *fp) + { ++ if (!filename && STREQ (mode, "wb")) ++ { ++ int flag = fcntl (fileno (fp), F_GETFL); ++ if (0 <= flag && (flag & O_APPEND)) ++ mode = "ab"; ++ } + if (!freopen (filename, mode, fp)) + { + char const *f = (filename ? filename +--- coreutils-8.23/chcon.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/chcon.c 2014-10-13 08:30:37.180881200 -0700 +@@ -48,7 +48,7 @@ static bool verbose; + + /* Pointer to the device and inode numbers of '/', when --recursive. + Otherwise NULL. */ +-static struct dev_ino *root_dev_ino; ++static struct root_dev_ino *root_dev_ino; + + /* The name of the context file is being given. */ + static char const *specified_context; +@@ -569,7 +569,7 @@ main (int argc, char **argv) + + if (recurse && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/chgrp.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/chgrp.c 2014-10-13 08:30:37.180881200 -0700 +@@ -299,7 +299,7 @@ main (int argc, char **argv) + + if (chopt.recurse && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + chopt.root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (chopt.root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/chmod.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/chmod.c 2014-10-13 08:30:37.180881200 -0700 +@@ -81,7 +81,7 @@ static enum Verbosity verbosity = V_off; + + /* Pointer to the device and inode numbers of '/', when --recursive. + Otherwise NULL. */ +-static struct dev_ino *root_dev_ino; ++static struct root_dev_ino *root_dev_ino; + + /* For long options that have no equivalent short option, use a + non-character as a pseudo short option, starting with CHAR_MAX + 1. */ +@@ -552,7 +552,7 @@ main (int argc, char **argv) + + if (recurse && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/chown-core.h 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/chown-core.h 2014-10-13 08:30:37.196451900 -0700 +@@ -50,7 +50,7 @@ struct Chown_option + + /* Pointer to the device and inode numbers of '/', when --recursive. + Need not be freed. Otherwise NULL. */ +- struct dev_ino *root_dev_ino; ++ struct root_dev_ino *root_dev_ino; + + /* This corresponds to the --dereference (opposite of -h) option. */ + bool affect_symlink_referent; +--- coreutils-8.23/chown.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/chown.c 2014-10-13 08:30:37.196451900 -0700 +@@ -312,7 +312,7 @@ main (int argc, char **argv) + + if (chopt.recurse && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + chopt.root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (chopt.root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/chroot.c 2014-07-13 16:59:20.000000000 -0700 ++++ coreutils-8.23/src/chroot.c 2014-10-13 08:30:37.196451900 -0700 +@@ -163,7 +163,7 @@ parse_additional_groups (char const *gro + static bool + is_root (const char* dir) + { +- struct dev_ino root_ino; ++ struct root_dev_ino root_ino; + if (! get_root_dev_ino (&root_ino)) + error (EXIT_CANCELED, errno, _("failed to get attributes of %s"), + quote ("/")); +@@ -173,7 +173,7 @@ is_root (const char* dir) + error (EXIT_CANCELED, errno, _("failed to get attributes of %s"), + quote (dir)); + +- return SAME_INODE (root_ino, arg_st); ++ return ROOT_DEV_INO_CHECK (&root_ino, &arg_st); + } + + void +--- coreutils-8.23/cksum.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/cksum.c 2014-10-13 08:30:37.196451900 -0700 +@@ -301,6 +301,9 @@ main (int argc, char **argv) + + have_read_stdin = false; + ++ if (O_BINARY) ++ xfreopen (NULL, "wb", stdout); ++ + if (optind == argc) + ok = cksum ("-", false); + else +--- coreutils-8.23/copy.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/copy.c 2014-10-13 08:49:30.450181800 -0700 +@@ -70,6 +70,10 @@ + # include "verror.h" + #endif + ++#if __CYGWIN__ ++# include "cygwin.h" ++#endif ++ + #ifndef HAVE_FCHOWN + # define HAVE_FCHOWN false + # define fchown(fd, uid, gid) (-1) +@@ -1313,7 +1317,11 @@ close_src_desc: + static bool + same_file_ok (char const *src_name, struct stat const *src_sb, + char const *dst_name, struct stat const *dst_sb, +- const struct cp_options *x, bool *return_now, bool *unlink_src) ++ const struct cp_options *x, bool *return_now, bool *unlink_src ++#if __CYGWIN__ ++ , bool *case_change ++#endif ++ ) + { + const struct stat *src_sb_link; + const struct stat *dst_sb_link; +@@ -1461,6 +1469,18 @@ same_file_ok (char const *src_name, stru + if (S_ISLNK (dst_sb_link->st_mode)) + return true; + ++#if __CYGWIN__ ++ /* If the files have the same name, but differ in case, then let ++ rename() change the case. */ ++ if (same_link && x->move_mode && same_name (src_name, dst_name) ++ && memcmp (last_component (src_name), last_component (dst_name), ++ base_len (src_name)) != 0) ++ { ++ *case_change = true; ++ return true; ++ } ++#endif /* __CYGWIN__ */ ++ + if (same_link + && 1 < dst_sb_link->st_nlink + && ! same_name (src_name, dst_name)) +@@ -1813,10 +1833,20 @@ copy_internal (char const *src_name, cha + && ! (x->move_mode || x->symbolic_link || x->hard_link + || x->backup_type != no_backups + || x->unlink_dest_before_opening)); +- if ((use_stat +- ? stat (dst_name, &dst_sb) +- : lstat (dst_name, &dst_sb)) +- != 0) ++ int res = (use_stat ++ ? stat (dst_name, &dst_sb) ++ : lstat (dst_name, &dst_sb)); ++#if __CYGWIN__ ++ /* stat("a") succeeds even if it was really "a.exe". */ ++ if (! res && 0 < cygwin_spelling (dst_name)) ++ { ++ /* Only DST_NAME.exe exists, but we want the non-existant ++ DST_NAME. */ ++ res = -1; ++ errno = ENOENT; ++ } ++#endif /* __CYGWIN__ */ ++ if (res != 0) + { + if (errno != ENOENT) + { +@@ -1833,10 +1863,17 @@ copy_internal (char const *src_name, cha + that it is stat'able or lstat'able. */ + bool return_now; + bool unlink_src; ++#if __CYGWIN__ ++ bool case_change = false; ++#endif /* __CYGWIN__ */ + + have_dst_lstat = !use_stat; + if (! same_file_ok (src_name, &src_sb, dst_name, &dst_sb, +- x, &return_now, &unlink_src)) ++ x, &return_now, &unlink_src ++#if __CYGWIN__ ++ , &case_change ++#endif ++)) + { + error (0, 0, _("%s and %s are the same file"), + quote_n (0, src_name), quote_n (1, dst_name)); +@@ -1895,6 +1932,9 @@ copy_internal (char const *src_name, cha + cp and mv treat -i and -f differently. */ + if (x->move_mode) + { ++#if __CYGWIN__ ++ if (!case_change) ++#endif /* __CYGWIN__ */ + if (abandon_move (x, dst_name, &dst_sb) + || (unlink_src && unlink (src_name) == 0)) + { +@@ -2058,7 +2098,11 @@ copy_internal (char const *src_name, cha + /* Never unlink dst_name when in move mode. */ + && ! x->move_mode + && (x->unlink_dest_before_opening +- || (x->preserve_links && 1 < dst_sb.st_nlink) ++ || (x->preserve_links && 1 < dst_sb.st_nlink ++#if __CYGWIN__ ++ && !case_change ++#endif /* __CYGWIN__ */ ++ ) + || (x->dereference == DEREF_NEVER + && ! S_ISREG (src_sb.st_mode)) + )) +@@ -2816,6 +2860,21 @@ copy (char const *src_name, char const * + { + assert (valid_options (options)); + ++#if __CYGWIN__ ++ /* .exe magic - if src exists with an implicit .exe suffix and is ++ not a symlink, but dst does not exist and was also specified ++ without a suffix, then append .exe to dst. */ ++ int cygwin = cygwin_spelling (src_name); ++ char *p; ++ if (cygwin == 2 ++ && ((p = strchr (dst_name, '\0') - 4) <= dst_name ++ || strcasecmp (p, ".exe") != 0)) ++ { ++ cygwin = 3; ++ CYGWIN_APPEND_EXE (p, dst_name); ++ } ++#endif /* __CYGWIN__ */ ++ + /* Record the file names: they're used in case of error, when copying + a directory into itself. I don't like to make these tools do *any* + extra work in the common case when that work is solely to handle +@@ -2827,10 +2886,15 @@ copy (char const *src_name, char const * + top_level_dst_name = dst_name; + + bool first_dir_created_per_command_line_arg = false; +- return copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL, ++ bool result = copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL, + options, true, + &first_dir_created_per_command_line_arg, + copy_into_self, rename_succeeded); ++#if __CYGWIN__ ++ if (cygwin == 3) ++ freea ((char *) dst_name); ++#endif /* __CYGWIN__ */ ++ return result; + } + + /* Set *X to the default options for a value of type struct cp_options. */ +--- coreutils-8.23/dd.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/dd.c 2014-10-13 08:30:37.196451900 -0700 +@@ -37,6 +37,10 @@ + #include "xstrtol.h" + #include "xtime.h" + ++#if __CYGWIN__ ++# include ++#endif ++ + /* The official name of this program (e.g., no 'g' prefix). */ + #define PROGRAM_NAME "dd" + +@@ -1862,6 +1866,13 @@ copy_with_unblock (char const *buf, size + static void + set_fd_flags (int fd, int add_flags, char const *name) + { ++#if __CYGWIN__ ++ /* Cygwin does not allow fcntl to set the mode. */ ++ int mode_flags = add_flags & (O_BINARY | O_TEXT); ++ add_flags &= ~(O_BINARY | O_TEXT); ++ if (mode_flags && setmode (fd, mode_flags) == -1) ++ error (EXIT_FAILURE, errno, _("setting flags for %s"), quote (name)); ++#endif /* __CYGWIN__ */ + /* Ignore file creation flags that are no-ops on file descriptors. */ + add_flags &= ~ (O_NOCTTY | O_NOFOLLOW); + +@@ -2242,6 +2253,8 @@ main (int argc, char **argv) + } + else + { ++ if ((input_flags & (O_BINARY | O_TEXT)) == 0) ++ input_flags |= O_BINARY; + if (fd_reopen (STDIN_FILENO, input_file, O_RDONLY | input_flags, 0) < 0) + error (EXIT_FAILURE, errno, _("failed to open %s"), quote (input_file)); + } +@@ -2264,6 +2277,8 @@ main (int argc, char **argv) + | (conversions_mask & C_NOCREAT ? 0 : O_CREAT) + | (conversions_mask & C_EXCL ? O_EXCL : 0) + | (seek_records || (conversions_mask & C_NOTRUNC) ? 0 : O_TRUNC)); ++ if ((opts & (O_BINARY | O_TEXT)) == 0) ++ opts |= O_BINARY; + + /* Open the output file with *read* access only if we might + need to read to satisfy a 'seek=' request. If we can't read +--- coreutils-8.23/dircolors.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/dircolors.c 2014-10-13 08:30:37.196451900 -0700 +@@ -494,8 +494,12 @@ main (int argc, char **argv) + } + else + { ++ /* tcsh treats LS_COLORS as a magic shell variable for its ++ builtin ls-F, but does not recognize all the categories ++ that coreutils ls does. Therefore, silence stderr to ++ avoid messages like "Unknown colorls variable `su'.". */ + prefix = "setenv LS_COLORS '"; +- suffix = "'\n"; ++ suffix = "' >&/dev/null\n"; + } + fputs (prefix, stdout); + fwrite (s, 1, len, stdout); +--- coreutils-8.23/install.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/install.c 2014-10-13 08:30:37.196451900 -0700 +@@ -44,6 +44,10 @@ + #include "utimens.h" + #include "xstrtol.h" + ++#if __CYGWIN__ ++# include "cygwin.h" ++#endif ++ + /* The official name of this program (e.g., no 'g' prefix). */ + #define PROGRAM_NAME "install" + +@@ -531,6 +535,16 @@ strip (char const *name) + error (0, errno, _("fork system call failed")); + break; + case 0: /* Child. */ ++#if __CYGWIN__ ++ { ++ /* Check for .exe here, since strip doesn't. */ ++ char *p; ++ if (((p = strchr (name, '\0') - 4) <= name ++ || strcasecmp (p, ".exe") != 0) ++ && 0 < cygwin_spelling (name)) ++ CYGWIN_APPEND_EXE (p, name); ++ } ++#endif /* __CYGWIN__ */ + execlp (strip_program, strip_program, name, NULL); + error (EXIT_FAILURE, errno, _("cannot run %s"), strip_program); + break; +--- coreutils-8.23/ls.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/ls.c 2014-10-13 08:30:37.196451900 -0700 +@@ -117,6 +117,10 @@ + # include + #endif + ++#if __CYGWIN__ ++# include "cygwin.h" ++#endif ++ + #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \ + : (ls_mode == LS_MULTI_COL \ + ? "dir" : "vdir")) +@@ -747,6 +751,11 @@ static char const *long_time_format[2] = + N_("%b %e %H:%M") + }; + ++#if __CYGWIN__ ++/* Whether .exe should be appended to command-line args as needed. */ ++static bool append_exe; ++#endif /* __CYGWIN__ */ ++ + /* The set of signals that are caught. */ + + static sigset_t caught_signals; +@@ -782,6 +791,9 @@ enum + enum + { + AUTHOR_OPTION = CHAR_MAX + 1, ++#if __CYGWIN__ ++ APPEND_EXE_OPTION, ++#endif /* __CYGWIN__ */ + BLOCK_SIZE_OPTION, + COLOR_OPTION, + DEREFERENCE_COMMAND_LINE_SYMLINK_TO_DIR_OPTION, +@@ -843,6 +855,9 @@ static struct option const long_options[ + {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION}, + {"context", no_argument, 0, 'Z'}, + {"author", no_argument, NULL, AUTHOR_OPTION}, ++#if __CYGWIN__ ++ {"append-exe", no_argument, NULL, APPEND_EXE_OPTION}, ++#endif /* __CYGWIN__ */ + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, + {NULL, 0, NULL, 0} +@@ -1954,6 +1969,12 @@ decode_switches (int argc, char **argv) + print_scontext = true; + break; + ++#if __CYGWIN__ ++ case APPEND_EXE_OPTION: ++ append_exe = true; ++ break; ++#endif /* __CYGWIN__ */ ++ + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); +@@ -2924,6 +2945,12 @@ gobble_file (char const *name, enum file + uintmax_t blocks = 0; + struct fileinfo *f; + ++#if __CYGWIN__ ++ char *name_alt = NULL; ++ if (command_line_arg && append_exe && 0 < cygwin_spelling (name)) ++ CYGWIN_APPEND_EXE (name_alt, name); ++#endif /* __CYGWIN__ */ ++ + /* An inode value prior to gobble_file necessarily came from readdir, + which is not used for command line arguments. */ + assert (! command_line_arg || inode == NOT_AN_INODE_NUMBER); +@@ -3035,11 +3062,19 @@ gobble_file (char const *name, enum file + file_failure (command_line_arg, + _("cannot access %s"), absolute_name); + if (command_line_arg) +- return 0; ++ { ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ ++ return 0; ++ } + + f->name = xstrdup (name); + cwd_n_used++; + ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return 0; + } + +@@ -3223,6 +3258,9 @@ gobble_file (char const *name, enum file + f->name = xstrdup (name); + cwd_n_used++; + ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return blocks; + } + +@@ -4923,6 +4961,11 @@ Sort entries alphabetically if none of - + -Z, --context print any security context of each file\n\ + -1 list one file per line\n\ + "), stdout); ++#if __CYGWIN__ ++ fputs (_("\ ++ --append-exe append .exe if cygwin magic was needed\n\ ++"), stdout); ++#endif /* __CYGWIN__ */ + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); + emit_size_note (); +--- coreutils-8.23/md5sum.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/md5sum.c 2014-10-13 08:30:37.212072800 -0700 +@@ -813,6 +813,9 @@ main (int argc, char **argv) + if (optind == argc) + argv[argc++] = bad_cast ("-"); + ++ if (O_BINARY) ++ xfreopen (NULL, "wb", stdout); ++ + for (; optind < argc; ++optind) + { + char *file = argv[optind]; +--- coreutils-8.23/mv.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/mv.c 2014-10-13 08:30:37.212072800 -0700 +@@ -92,7 +92,7 @@ rm_option_init (struct rm_options *x) + x->require_restore_cwd = true; + + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + x->root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (x->root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +@@ -467,6 +467,16 @@ main (int argc, char **argv) + else if (!target_directory) + { + assert (2 <= n_files); ++#if __CYGWIN__ ++ struct stat s1, s2; ++ if (2 == n_files ++ && lstat (file[0], &s1) == 0 && lstat (file[1], &s2) == 0 ++ && s1.st_ino == s2.st_ino) ++ { ++ /* Allow 'mv foo Foo' to change case of the directory foo. */ ++ } ++ else ++#endif /* __CYGWIN__ */ + if (target_directory_operand (file[n_files - 1])) + target_directory = file[--n_files]; + else if (2 < n_files) +--- coreutils-8.23/pwd.c 2014-07-13 15:09:52.000000000 -0700 ++++ coreutils-8.23/src/pwd.c 2014-10-13 08:30:37.212072800 -0700 +@@ -268,8 +268,8 @@ static void + robust_getcwd (struct file_name *file_name) + { + size_t height = 1; +- struct dev_ino dev_ino_buf; +- struct dev_ino *root_dev_ino = get_root_dev_ino (&dev_ino_buf); ++ struct root_dev_ino dev_ino_buf; ++ struct root_dev_ino *root_dev_ino = get_root_dev_ino (&dev_ino_buf); + struct stat dot_sb; + + if (root_dev_ino == NULL) +@@ -282,7 +282,7 @@ robust_getcwd (struct file_name *file_na + while (1) + { + /* If we've reached the root, we're done. */ +- if (SAME_INODE (dot_sb, *root_dev_ino)) ++ if (ROOT_DEV_INO_CHECK (root_dev_ino, &dot_sb)) + break; + + find_dir_entry (&dot_sb, file_name, height++); +@@ -291,6 +291,9 @@ robust_getcwd (struct file_name *file_na + /* See if a leading slash is needed; file_name_prepend adds one. */ + if (file_name->start[0] == '\0') + file_name_prepend (file_name, "", 0); ++ /* If we aren't in `/', we must be in `//'. */ ++ if (! SAME_INODE (root_dev_ino->single_slash, dot_sb)) ++ file_name_prepend (file_name, "", 0); + } + + +--- coreutils-8.23/remove.h 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/remove.h 2014-10-13 08:30:37.212072800 -0700 +@@ -54,7 +54,7 @@ struct rm_options + + /* Pointer to the device and inode numbers of '/', when --recursive + and preserving '/'. Otherwise NULL. */ +- struct dev_ino *root_dev_ino; ++ struct root_dev_ino *root_dev_ino; + + /* If nonzero, stdin is a tty. */ + bool stdin_tty; +--- coreutils-8.23/rm.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/rm.c 2014-10-13 08:30:37.212072800 -0700 +@@ -325,7 +325,7 @@ main (int argc, char **argv) + + if (x.recursive && preserve_root) + { +- static struct dev_ino dev_ino_buf; ++ static struct root_dev_ino dev_ino_buf; + x.root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (x.root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), +--- coreutils-8.23/stat.c 2014-07-11 04:00:07.000000000 -0700 ++++ coreutils-8.23/src/stat.c 2014-10-13 08:30:37.212072800 -0700 +@@ -73,6 +73,13 @@ + #include "find-mount-point.h" + #include "xvasprintf.h" + ++#if __CYGWIN__ ++# include "cygwin.h" ++/* Whether .exe should be appended to command-line args as needed. */ ++static bool append_exe; ++# define APPEND_EXE_OPTION 10000 ++#endif ++ + #if USE_STATVFS + # define STRUCT_STATVFS struct statvfs + # define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATVFS_F_FSID_IS_INTEGER +@@ -189,6 +196,9 @@ static struct option const long_options[ + {"format", required_argument, NULL, 'c'}, + {"printf", required_argument, NULL, PRINTF_OPTION}, + {"terse", no_argument, NULL, 't'}, ++#if __CYGWIN__ ++ {"append-exe", no_argument, NULL, APPEND_EXE_OPTION}, ++#endif /* __CYGWIN__ */ + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, + {NULL, 0, NULL, 0} +@@ -1264,14 +1274,26 @@ do_statfs (char const *filename, char co + return false; + } + ++#if __CYGWIN__ ++ char *name_alt = NULL; ++ if (append_exe && 0 < cygwin_spelling (filename)) ++ CYGWIN_APPEND_EXE (name_alt, filename); ++#endif /* __CYGWIN__ */ ++ + if (STATFS (filename, &statfsbuf) != 0) + { + error (0, errno, _("cannot read file system information for %s"), + quote (filename)); ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return false; + } + + bool fail = print_it (format, -1, filename, print_statfs, &statfsbuf); ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return ! fail; + } + +@@ -1282,6 +1304,7 @@ do_stat (char const *filename, char cons + { + int fd = STREQ (filename, "-") ? 0 : -1; + struct stat statbuf; ++ char *name_alt = NULL; + + if (0 <= fd) + { +@@ -1294,18 +1317,29 @@ do_stat (char const *filename, char cons + /* We can't use the shorter + (follow_links?stat:lstat) (filename, &statbug) + since stat might be a function-like macro. */ +- else if ((follow_links +- ? stat (filename, &statbuf) +- : lstat (filename, &statbuf)) != 0) ++ else + { +- error (0, errno, _("cannot stat %s"), quote (filename)); +- return false; ++ if ((follow_links ++ ? stat (filename, &statbuf) ++ : lstat (filename, &statbuf)) != 0) ++ { ++ error (0, errno, _("cannot stat %s"), quote (filename)); ++ return false; ++ } ++ ++#if __CYGWIN__ ++ if (append_exe && 0 < cygwin_spelling (filename)) ++ CYGWIN_APPEND_EXE (name_alt, filename); ++#endif /* __CYGWIN__ */ + } + + if (S_ISBLK (statbuf.st_mode) || S_ISCHR (statbuf.st_mode)) + format = format2; + + bool fail = print_it (format, fd, filename, print_stat, &statbuf); ++#if __CYGWIN__ ++ freea (name_alt); ++#endif /* __CYGWIN__ */ + return ! fail; + } + +@@ -1427,6 +1461,11 @@ Display file or file system status.\n\ + if you want a newline, include \\n in FORMAT\n\ + -t, --terse print the information in terse form\n\ + "), stdout); ++#if __CYGWIN__ ++ fputs (_("\ ++ --append-exe append .exe if cygwin magic was needed\n\ ++"), stdout); ++#endif /* __CYGWIN__ */ + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); + +@@ -1547,6 +1586,12 @@ main (int argc, char *argv[]) + terse = true; + break; + ++#if __CYGWIN__ ++ case APPEND_EXE_OPTION: ++ append_exe = true; ++ break; ++#endif /* __CYGWIN__ */ ++ + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1dc5bfaccfb3..f8dda538fd7b 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, perl, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null +, autoconf, automake114x }: assert aclSupport -> acl != null; @@ -18,6 +19,8 @@ let sha256 = "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc"; }; + patches = if stdenv.isCygwin then [ ./coreutils-8.23-4.cygwin.patch ] else null; + # The test tends to fail on btrfs and maybe other unusual filesystems. postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh @@ -26,6 +29,7 @@ let nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl + ++ optionals stdenv.isCygwin [ autoconf automake114x ] # due to patch ++ optionals selinuxSupport [ libselinux libsepol ]; crossAttrs = { diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index eb8c026ab0f7..188b573efeca 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { configureFlags = [ "gl_cv_func_wcwidth_works=yes" ]; }; + preConfigure = if stdenv.isCygwin then '' + sed -i gnulib/lib/fpending.h -e '/include /d' + '' else null; + meta = { homepage = http://www.gnu.org/software/findutils/; description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system"; From 6756d7cdf897aa038972a302957522fe5f596d64 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 23 Oct 2014 20:10:49 +0200 Subject: [PATCH 029/127] cygwin: gzip fpending --- pkgs/tools/compression/gzip/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 44b121117ad5..6772e21cb0cb 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + preConfigure = if stdenv.isCygwin then '' + sed -i lib/fpending.h -e 's,include ,,' + '' else null; + # In stdenv-linux, prevent a dependency on bootstrap-tools. makeFlags = "SHELL=/bin/sh GREP=grep"; From 3961eb8a6cae5391d0c1648b35ba301bd03fc77e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 16 Oct 2014 02:52:47 +0200 Subject: [PATCH 030/127] cygwin: gnutar fpending --- pkgs/tools/archivers/gnutar/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 8c48417a8191..00be39677689 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { # cannot be used as a login shell for now. FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1"; + preConfigure = if stdenv.isCygwin then '' + sed -i gnu/fpending.h -e 's,include ,,' + '' else null; + meta = { homepage = http://www.gnu.org/software/tar/; description = "GNU implementation of the `tar' archiver"; From 387ad260c0aeb3b50497c665765fbd67168100d9 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 23 Oct 2014 20:10:12 +0200 Subject: [PATCH 031/127] cygwin: cpio fpending --- pkgs/tools/archivers/cpio/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 6a61ded4b198..2cd65391216d 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation { # one "<" and one "&" sign get mangled in the patch in "cat ${pp} | sed 's/</,,' + '' else null; + meta = { homepage = http://www.gnu.org/software/cpio/; description = "A program to create or extract from cpio archives"; From 447adb305fa00a1ab64ba5d51ed31ce914cfc833 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 23 Oct 2014 20:03:22 +0200 Subject: [PATCH 032/127] cygwin: mysql patches --- pkgs/servers/sql/mysql/5.5.17-cygwin.patch | 44 +++++++++++++++++++ .../sql/mysql/5.5.17-export-symbols.patch | 22 ++++++++++ pkgs/servers/sql/mysql/5.5.x.nix | 5 +++ 3 files changed, 71 insertions(+) create mode 100644 pkgs/servers/sql/mysql/5.5.17-cygwin.patch create mode 100644 pkgs/servers/sql/mysql/5.5.17-export-symbols.patch diff --git a/pkgs/servers/sql/mysql/5.5.17-cygwin.patch b/pkgs/servers/sql/mysql/5.5.17-cygwin.patch new file mode 100644 index 000000000000..f5178cd3f390 --- /dev/null +++ b/pkgs/servers/sql/mysql/5.5.17-cygwin.patch @@ -0,0 +1,44 @@ +--- mysql-5.5.17/cmake/install_macros.cmake 2011-10-12 07:10:24.000000000 -0500 ++++ mysql-5.5.17/cmake/install_macros.cmake 2011-11-07 23:19:35.772837800 -0600 +@@ -230,7 +230,13 @@ FUNCTION(MYSQL_INSTALL_TARGETS) + IF(ARG_COMPONENT) + SET(COMP COMPONENT ${ARG_COMPONENT}) + ENDIF() +- INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP}) ++ IF(${ARG_DESTINATION} STREQUAL "${INSTALL_LIBDIR}") ++ INSTALL(TARGETS ${TARGETS} LIBRARY DESTINATION ${ARG_DESTINATION} ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP}) ++ ELSE() ++ INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP}) ++ ENDIF() + SET(INSTALL_LOCATION ${ARG_DESTINATION} ) + INSTALL_DEBUG_SYMBOLS("${TARGETS}") + SET(INSTALL_LOCATION) +--- mysql-5.5.17/libmysql/CMakeLists.txt 2011-10-12 07:10:24.000000000 -0500 ++++ mysql-5.5.17/libmysql/CMakeLists.txt 2011-11-08 03:19:31.379219300 -0600 +@@ -214,6 +214,7 @@ IF(NOT DISABLE_SHARED) + SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) + SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) + ++ IF(NOT CYGWIN) + # Install links to libmysqlclient.so (client_r) + GET_VERSIONED_LIBNAME( + "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r" +@@ -231,5 +232,6 @@ IF(NOT DISABLE_SHARED) + linkname) + INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) + ENDFOREACH() ++ ENDIF(NOT CYGWIN) + ENDIF() + ENDIF() +--- mysql-5.5.17/strings/dtoa.c 2011-10-12 07:10:25.000000000 -0500 ++++ mysql-5.5.17/strings/dtoa.c 2011-11-07 20:38:05.064690100 -0600 +@@ -36,6 +36,7 @@ + + ***************************************************************/ + ++#define __STRICT_ANSI__ + #include /* for EOVERFLOW on Windows */ + #include + #include /* for memcpy and NOT_FIXED_DEC */ diff --git a/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch b/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch new file mode 100644 index 000000000000..edc93c44dfe3 --- /dev/null +++ b/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch @@ -0,0 +1,22 @@ +--- mysql-5.5.17/libmysql/CMakeLists.txt 2011-10-12 07:10:24.000000000 -0500 ++++ mysql-5.5.17/libmysql/CMakeLists.txt 2011-11-08 03:19:31.379219300 -0600 +@@ -25,6 +25,11 @@ INCLUDE_DIRECTORIES( + ADD_DEFINITIONS(${SSL_DEFINES}) + + SET(CLIENT_API_FUNCTIONS ++dynstr_free ++dynstr_append_mem ++dynstr_append_os_quoted ++dynstr_realloc ++init_dynamic_string + get_tty_password + handle_options + load_defaults +@@ -131,6 +136,7 @@ mysql_server_end + mysql_set_character_set + mysql_get_character_set_info + mysql_stmt_next_result ++strfill + + CACHE INTERNAL "Functions exported by client API" + diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index d25882b826ee..778e2f58eb7c 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0jn7py2wsq78rwi7vfihxs6z3h5hr338b9g46fl3z2g4ddki4yw8"; }; + patches = if stdenv.isCygwin then [ + ./5.5.17-cygwin.patch + ./5.5.17-export-symbols.patch + ] else null; + preConfigure = stdenv.lib.optional stdenv.isDarwin '' ln -s /bin/ps $TMPDIR/ps export PATH=$PATH:$TMPDIR From feef088b396197a323d299417c2613777008a5f4 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 23 Oct 2014 20:09:09 +0200 Subject: [PATCH 033/127] cygwin: readline bash_cv_func_sigsetjmp=missing --- pkgs/development/libraries/readline/6.3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 93e24ed0c032..f770fabb35d3 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { # Don't run the native `strip' when cross-compiling. dontStrip = stdenv ? cross; + bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; meta = with stdenv.lib; { description = "Library for interactive line editing"; From d917f8c7c9fdd4b3679ebc7c9aeed6d176d4f712 Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Fri, 24 Oct 2014 00:48:06 +0200 Subject: [PATCH 034/127] cygwin: w3m --- .../networking/browsers/w3m/cygwin.patch | 1710 +++++++++++++++++ .../networking/browsers/w3m/default.nix | 3 +- 2 files changed, 1712 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/w3m/cygwin.patch diff --git a/pkgs/applications/networking/browsers/w3m/cygwin.patch b/pkgs/applications/networking/browsers/w3m/cygwin.patch new file mode 100644 index 000000000000..767cc289b5f6 --- /dev/null +++ b/pkgs/applications/networking/browsers/w3m/cygwin.patch @@ -0,0 +1,1710 @@ +diff -ur w3m-0.5.3/config.guess new/w3m-0.5.3/config.guess +--- w3m-0.5.3/config.guess 2004-08-04 13:32:27.000000000 -0400 ++++ w3m-0.5.3/config.guess 2013-04-28 18:43:59.480227700 -0400 +@@ -1,13 +1,14 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012, 2013 Free Software Foundation, Inc. + +-timestamp='2004-03-12' ++timestamp='2012-12-29' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -16,24 +17,22 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). ++# ++# Originally written by Per Bothner. + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# Please send patches with a ChangeLog entry to config-patches@gnu.org. ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -53,8 +52,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, ++2012, 2013 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -66,11 +66,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -104,7 +104,7 @@ + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; + trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +@@ -123,7 +123,7 @@ + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ;' ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi@noc.rutgers.edu 1994-08-24) +@@ -141,7 +141,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -158,6 +158,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -166,7 +167,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -176,7 +177,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -196,71 +197,34 @@ + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; +- amd64:OpenBSD:*:*) +- echo x86_64-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- cats:OpenBSD:*:*) +- echo arm-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pegasos:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; + macppc:MirBSD:*:*) +- echo powerppc-unknown-mirbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -306,40 +270,46 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; +- Alpha*:OpenVMS:*:*) +- echo alpha-hp-vms +- exit 0 ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix +- exit 0 ;; ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 +- exit 0 ;; ++ echo powerpc-ibm-os400 ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ exit ;; ++ arm*:riscos:*:*|arm*:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -347,32 +317,51 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 +- exit 0 ;; +- DRS?6000:UNIX_SV:4.2*:7*) ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7 && exit 0 ;; ++ sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -381,10 +370,10 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 +@@ -396,10 +385,10 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -409,41 +398,41 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -467,35 +456,36 @@ + exit (-1); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c \ +- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -508,29 +498,29 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +@@ -538,7 +528,7 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build +@@ -553,15 +543,19 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) ++ exit ;; ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -574,28 +568,28 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in +@@ -604,52 +598,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -657,9 +651,19 @@ + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then +- # avoid double evaluation of $set_cc_for_build +- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -667,11 +671,11 @@ + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -699,224 +703,269 @@ + exit (0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; ++ exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; ++ exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + *:UNICOS/mp:*:*) +- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:FreeBSD:*:*) +- # Determine whether the default compiler uses glibc. +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #if __GLIBC__ >= 2 +- LIBC=gnu +- #else +- LIBC= +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using +- # FreeBSD's kernel, but not the complete OS. +- case ${LIBC} in gnu) kernel_only='k' ;; esac +- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} +- exit 0 ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) ++ exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; +- x86:Interix*:[34]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit 0 ;; ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +- exit 0 ;; ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix +- exit 0 ;; ++ exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin +- exit 0 ;; ++ exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu +- exit 0 ;; ++ exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; ++ exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu +- exit 0 ;; +- ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- m68*:Linux:*:*) ++ exit ;; ++ hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- mips:Linux:*:*) ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips +- #undef mipsel +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips +- #else +- CPU= +- #endif ++ #ifdef __dietlibc__ ++ LIBC=dietlibc + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 +- ;; +- mips64:Linux:*:*) ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; ++ ia64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips64 +- #undef mips64el ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit 0 ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit 0 ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ or32:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -924,115 +973,71 @@ + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac +- exit 0 ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu +- exit 0 ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit 0 ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit 0 ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit 0 ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #ifdef __INTEL_COMPILER +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 +- ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; ++ exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; +- i*86:syllable:*:*) ++ exit ;; ++ i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable +- exit 0 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; ++ exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +@@ -1040,15 +1045,16 @@ + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; ++ exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv +- exit 0 ;; ++ exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +@@ -1140,68 +1159,97 @@ + else + echo ns32k-sni-sysv + fi +- exit 0 ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos +- exit 0 ;; ++ exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Darwin:*:*) +- case `uname -p` in +- *86) UNAME_PROCESSOR=i686 ;; +- powerpc) UNAME_PROCESSOR=powerpc ;; ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then +@@ -1209,22 +1257,28 @@ + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; ++ exit ;; ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 +@@ -1235,36 +1289,55 @@ + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; ++ exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} +- exit 0 ;; ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit 0 ;; ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + + #if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); ++ printf ("arm-acorn-riscix\n"); exit (0); + #endif + + #if defined (hp300) && !defined (hpux) +@@ -1380,11 +1453,12 @@ + } + EOF + +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + + # Convex versions that predate uname can use getsysinfo(1) + +@@ -1393,22 +1467,22 @@ + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + c34*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + c38*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + c4*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + esac + fi + +@@ -1419,7 +1493,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- ftp://ftp.gnu.org/pub/gnu/config/ ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++and ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -ur w3m-0.5.3/main.c new/w3m-0.5.3/main.c +--- w3m-0.5.3/main.c 2011-01-04 04:42:19.000000000 -0500 ++++ w3m-0.5.3/main.c 2013-04-28 18:42:08.408034100 -0400 +@@ -789,7 +789,8 @@ + } + + #ifdef USE_BINMODE_STREAM +- setmode(fileno(stdout), O_BINARY); ++ /* Seems to only be needed for old versions of Cygwin */ ++ /***setmode(fileno(stdout), O_BINARY);***/ + #endif + if (!w3m_dump && !w3m_backend) { + fmInit(); diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index bf14e7e53414..5d9705cfe1bd 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { patches = [ ./glibc214.patch ] # Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that # alpha. At the time of writing this, boehm-gc-7.1 is the last stable. - ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ]; + ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ] + ++ stdenv.lib.optional stdenv.isCygwin ./cygwin.patch; buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl From c4efe32d4d824e0046d53de17401fd6cdd5132f1 Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Thu, 23 Oct 2014 22:45:01 +0200 Subject: [PATCH 035/127] cygwin: pkgconfig --- .../misc/pkgconfig/2.36.3-not-win32.patch | 311 ++++++++++++++++++ .../tools/misc/pkgconfig/default.nix | 8 +- 2 files changed, 316 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch diff --git a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch new file mode 100644 index 000000000000..246173d465af --- /dev/null +++ b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch @@ -0,0 +1,311 @@ +--- a/glib/configure.ac 2013-08-04 20:21:20.808722600 -0500 ++++ b/glib/configure.ac 2013-08-04 18:30:21.852852200 -0500 +@@ -1880,7 +1880,7 @@ dnl ************************************ + + AC_MSG_CHECKING(for platform-dependent source) + case "$host" in +- *-*-cygwin*|*-*-mingw*) ++ *-*-mingw*) + PLATFORMDEP=gwin32.lo + ;; + *) +@@ -2594,9 +2594,6 @@ dnl *** Win32 API libs *** + dnl ********************** + + case $host in +- *-*-cygwin*) +- G_LIBS_EXTRA="-luser32 -lkernel32" +- ;; + *-*-mingw*) + G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm -lshlwapi" + ;; +--- a/glib/glib/gatomic.c 2013-08-04 20:21:20.907728300 -0500 ++++ b/glib/glib/gatomic.c 2013-08-04 18:11:14.000000000 -0500 +@@ -464,7 +464,7 @@ gsize + return g_atomic_pointer_xor ((volatile gpointer *) atomic, val); + } + +-#elif defined (G_PLATFORM_WIN32) ++#elif defined (G_OS_WIN32) + + #include + #if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) && !(defined _MSC_VER && _MSC_VER <= 1200) +--- a/glib/glib/gcharset.c 2013-08-04 20:21:20.925729300 -0500 ++++ b/glib/glib/gcharset.c 2013-08-04 18:11:14.000000000 -0500 +@@ -496,7 +496,7 @@ guess_category_value (const gchar *categ + if ((retval != NULL) && (retval[0] != '\0')) + return retval; + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + /* g_win32_getlocale() first checks for LC_ALL, LC_MESSAGES and + * LANG, which we already did above. Oh well. The main point of + * calling g_win32_getlocale() is to get the thread's locale as used +--- a/glib/glib/gconvert.c 2013-08-04 20:21:20.933729800 -0500 ++++ b/glib/glib/gconvert.c 2013-08-04 18:11:14.000000000 -0500 +@@ -33,9 +33,6 @@ + + #ifdef G_OS_WIN32 + #include "win_iconv.c" +-#endif +- +-#ifdef G_PLATFORM_WIN32 + #define STRICT + #include + #undef STRICT +@@ -1258,7 +1255,7 @@ g_locale_from_utf8 (const gchar *utf8str + charset, "UTF-8", bytes_read, bytes_written, error); + } + +-#ifndef G_PLATFORM_WIN32 ++#ifndef G_OS_WIN32 + + typedef struct _GFilenameCharsetCache GFilenameCharsetCache; + +@@ -1374,7 +1371,7 @@ g_get_filename_charsets (const gchar *** + return cache->is_utf8; + } + +-#else /* G_PLATFORM_WIN32 */ ++#else /* G_OS_WIN32 */ + + gboolean + g_get_filename_charsets (const gchar ***filename_charsets) +@@ -1403,7 +1400,7 @@ g_get_filename_charsets (const gchar *** + #endif + } + +-#endif /* G_PLATFORM_WIN32 */ ++#endif /* G_OS_WIN32 */ + + static gboolean + get_filename_charset (const gchar **filename_charset) +--- a/glib/glib/gfileutils.c 2013-08-04 20:21:20.942730300 -0500 ++++ b/glib/glib/gfileutils.c 2013-08-04 18:11:14.000000000 -0500 +@@ -2153,7 +2153,7 @@ g_path_skip_root (const gchar *file_name + { + g_return_val_if_fail (file_name != NULL, NULL); + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + /* Skip \\server\share or //server/share */ + if (G_IS_DIR_SEPARATOR (file_name[0]) && + G_IS_DIR_SEPARATOR (file_name[1]) && +@@ -2163,7 +2163,6 @@ g_path_skip_root (const gchar *file_name + gchar *p; + p = strchr (file_name + 2, G_DIR_SEPARATOR); + +-#ifdef G_OS_WIN32 + { + gchar *q; + +@@ -2171,7 +2170,6 @@ g_path_skip_root (const gchar *file_name + if (p == NULL || (q != NULL && q < p)) + p = q; + } +-#endif + + if (p && p > file_name + 2 && p[1]) + { +--- a/glib/glib/glib.h 2013-08-04 20:21:20.949730700 -0500 ++++ b/glib/glib/glib.h 2013-08-04 18:11:14.000000000 -0500 +@@ -96,7 +96,7 @@ + #include + #include + #include +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + #include + #endif + +--- a/glib/glib/gutf8.c 2013-08-04 20:21:20.984732700 -0500 ++++ b/glib/glib/gutf8.c 2013-08-04 18:11:14.000000000 -0500 +@@ -27,7 +27,7 @@ + #endif + #include + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + #include + #define STRICT + #include +--- a/glib/glib/gutils.c 2013-08-04 20:21:21.015734500 -0500 ++++ b/glib/glib/gutils.c 2013-08-04 18:11:14.000000000 -0500 +@@ -72,7 +72,7 @@ + #include "garray.h" + #include "glibintl.h" + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + #include "gconvert.h" + #include "gwin32.h" + #endif +@@ -86,16 +86,13 @@ + * These are portable utility functions. + */ + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + # include + # ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS + # define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2 + # define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 4 + # endif + # include /* For UNLEN */ +-#endif /* G_PLATFORM_WIN32 */ +- +-#ifdef G_OS_WIN32 + # include + # include + /* older SDK (e.g. msvc 5.0) does not have these*/ +@@ -131,7 +128,7 @@ + #include + #endif + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + + gchar * + _glib_get_dll_directory (void) +--- a/glib/glib/gutils.h 2013-08-04 20:21:21.067737500 -0500 ++++ b/glib/glib/gutils.h 2013-08-04 18:11:14.000000000 -0500 +@@ -350,7 +350,7 @@ g_bit_storage (gulong number) + * On non-Windows platforms, expands to nothing. + */ + +-#ifndef G_PLATFORM_WIN32 ++#ifndef G_OS_WIN32 + # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name) + #else + # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name) \ +@@ -378,7 +378,7 @@ DllMain (HINSTANCE hinstDLL, \ + + #endif /* !G_DISABLE_DEPRECATED */ + +-#endif /* G_PLATFORM_WIN32 */ ++#endif /* G_OS_WIN32 */ + + G_END_DECLS + +--- a/glib/glib/gwin32.h 2013-08-04 20:21:21.081738300 -0500 ++++ b/glib/glib/gwin32.h 2013-08-04 18:11:14.000000000 -0500 +@@ -33,7 +33,7 @@ + + #include + +-#ifdef G_PLATFORM_WIN32 ++#ifdef G_OS_WIN32 + + G_BEGIN_DECLS + +@@ -41,8 +41,6 @@ G_BEGIN_DECLS + #define MAXPATHLEN 1024 + #endif + +-#ifdef G_OS_WIN32 +- + /* + * To get prototypes for the following POSIXish functions, you have to + * include the indicated non-POSIX headers. The functions are defined +@@ -68,7 +66,6 @@ G_BEGIN_DECLS + GLIB_AVAILABLE_IN_ALL + gint g_win32_ftruncate (gint f, + guint size); +-#endif /* G_OS_WIN32 */ + + /* The MS setlocale uses locale names of the form "English_United + * States.1252" etc. We want the Unixish standard form "en", "zh_TW" +@@ -112,7 +109,7 @@ gchar* g_win32_locale_filename_ + + G_END_DECLS + +-#endif /* G_PLATFORM_WIN32 */ ++#endif /* G_OS_WIN32 */ + + #ifdef G_OS_WIN32 + #ifdef _WIN64 +--- a/glib/glib/libcharset/localcharset.c 2013-08-04 20:21:21.095739100 -0500 ++++ b/glib/glib/libcharset/localcharset.c 2013-08-04 18:11:14.000000000 -0500 +@@ -46,10 +46,6 @@ + # include + # endif + # endif +-# ifdef __CYGWIN__ +-# define WIN32_LEAN_AND_MEAN +-# include +-# endif + #elif defined WIN32_NATIVE + # define WIN32_LEAN_AND_MEAN + # include +@@ -111,7 +107,7 @@ _g_locale_get_charset_aliases (void) + cp = charset_aliases; + if (cp == NULL) + { +-#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) ++#if !(defined VMS || defined WIN32_NATIVE) + FILE *fp; + const char *dir; + const char *base = "charset.alias"; +@@ -237,7 +233,7 @@ _g_locale_get_charset_aliases (void) + "DECKOREAN" "\0" "EUC-KR" "\0"; + # endif + +-# if defined WIN32_NATIVE || defined __CYGWIN__ ++# if defined WIN32_NATIVE + /* To avoid the troubles of installing a separate file in the same + directory as the DLL and of retrieving the DLL's directory at + runtime, simply inline the aliases here. */ +@@ -292,53 +288,6 @@ _g_locale_charset_raw (void) + /* Most systems support nl_langinfo (CODESET) nowadays. */ + codeset = nl_langinfo (CODESET); + +-# ifdef __CYGWIN__ +- /* Cygwin 2006 does not have locales. nl_langinfo (CODESET) always +- returns "US-ASCII". As long as this is not fixed, return the suffix +- of the locale name from the environment variables (if present) or +- the codepage as a number. */ +- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) +- { +- const char *locale; +- static char buf[2 + 10 + 1]; +- +- locale = getenv ("LC_ALL"); +- if (locale == NULL || locale[0] == '\0') +- { +- locale = getenv ("LC_CTYPE"); +- if (locale == NULL || locale[0] == '\0') +- locale = getenv ("LANG"); +- } +- if (locale != NULL && locale[0] != '\0') +- { +- /* If the locale name contains an encoding after the dot, return +- it. */ +- const char *dot = strchr (locale, '.'); +- +- if (dot != NULL) +- { +- const char *modifier; +- +- dot++; +- /* Look for the possible @... trailer and remove it, if any. */ +- modifier = strchr (dot, '@'); +- if (modifier == NULL) +- return dot; +- if (modifier - dot < sizeof (buf)) +- { +- memcpy (buf, dot, modifier - dot); +- buf [modifier - dot] = '\0'; +- return buf; +- } +- } +- } +- +- /* Woe32 has a function returning the locale's codepage as a number. */ +- sprintf (buf, "CP%u", GetACP ()); +- codeset = buf; +- } +-# endif +- + # else + + /* On old systems which lack it, use setlocale or getenv. */ diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 2ce1fd7b6e4d..f01b52cbba71 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, vanilla ? false}: +{stdenv, fetchurl, automake, libiconv, vanilla ? false}: stdenv.mkDerivation (rec { name = "pkg-config-0.28"; @@ -10,13 +10,15 @@ stdenv.mkDerivation (rec { sha256 = "0igqq5m204w71m11y0nipbdf5apx87hwfll6axs12hn4dqfb6vkb"; }; + buildInputs = stdenv.lib.optional stdenv.isCygwin libiconv; + configureFlags = [ "--with-internal-glib" ]; - patches = if vanilla then [] else [ + patches = (if vanilla then [] else [ # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738. ./requires-private.patch - ]; + ]) ++ stdenv.lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; meta = { description = "A tool that allows packages to find out information about other packages"; From e45745f1f40efd1a510928c043530ab1c215762d Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Thu, 23 Oct 2014 22:46:09 +0200 Subject: [PATCH 036/127] cygwin: libatomic_ops: add missing interlibrary dep --- .../libraries/libatomic_ops/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 35ffe6d5fa59..cf74ed3b5f65 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, autoconf, automake, libtool }: let s = # Generated upstream information rec { @@ -9,15 +9,22 @@ let url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.2.tar.gz"; sha256="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4"; }; - buildInputs = [ - ]; -in -stdenv.mkDerivation { + + buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + +in stdenv.mkDerivation { inherit (s) name version; inherit buildInputs; + src = fetchurl { inherit (s) url sha256; }; + + preConfigure = if stdenv.isCygwin then '' + sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am + ./autogen.sh + '' else null; + meta = { inherit (s) version; description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; From f33f2a7e827fb282198f2f429a57c738181c65dc Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 23 Oct 2014 20:18:57 +0200 Subject: [PATCH 037/127] cygwin: disable gnumake check because of hanging test --- .../development/tools/build-managers/gnumake/3.82/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index fa7bb9e122ad..ce5eff878ead 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { }; /* On Darwin, there are 3 test failures that haven't been investigated - yet. */ - doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD; + yet. On cygwin at least parallelsim test hangs. */ + doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.isCygwin; patches = [ From 15952587a0b84aaf1544a37d97f34fc782ee3c6d Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 24 Oct 2014 02:58:58 +0200 Subject: [PATCH 038/127] cygwin gnugrep: disable check due to multibyte-white-space --- pkgs/tools/text/gnugrep/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index e73458d0abae..d03db13ed420 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { buildInputs = [ pcre libiconv ]; - doCheck = !stdenv.isDarwin; + # cygwin: FAIL: multibyte-white-space + doCheck = !stdenv.isDarwin && !stdenv.isCygwin; # On Mac OS X, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. From 2904aa33bb4fd1b9444205d07842d6f1f29ab927 Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Thu, 23 Oct 2014 19:15:56 +0200 Subject: [PATCH 039/127] cygwin: libffi --- pkgs/development/libraries/libffi/3.2.1-cygwin.patch | 10 ++++++++++ pkgs/development/libraries/libffi/default.nix | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/libraries/libffi/3.2.1-cygwin.patch diff --git a/pkgs/development/libraries/libffi/3.2.1-cygwin.patch b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch new file mode 100644 index 000000000000..f3b38dbd1c16 --- /dev/null +++ b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch @@ -0,0 +1,10 @@ +--- libffi-3.2.1/src/closures.c 2014-11-08 13:47:24.000000000 +0100 ++++ libffi-3.2.1/src/closures.c 2015-05-19 10:15:50.059325900 +0200 +@@ -212,6 +212,7 @@ + #include + + /* Cygwin is Linux-like, but not quite that Linux-like. */ ++#define is_emutramp_enabled() 0 + #define is_selinux_enabled() 0 + + #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */ diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index bc15e88ba2f8..668ac138be83 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh"; }; + patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null; + buildInputs = stdenv.lib.optional doCheck dejagnu; configureFlags = [ From af5484a630c65564c27e31eb658ded80a7751808 Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Fri, 24 Oct 2014 00:50:44 +0200 Subject: [PATCH 040/127] cygwin: opensp --- pkgs/tools/text/sgml/opensp/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 4b807718baae..92b506aa2c35 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl }: +{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: stdenv.mkDerivation { name = "opensp-1.5.2"; @@ -26,7 +26,11 @@ stdenv.mkDerivation { sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html ''; - buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; + preConfigure = if stdenv.isCygwin then "autoreconf -fi" else null; + + # need autoconf, automake, gettext, and libtool for reconfigure + buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake gettext libiconv libtool ] + ++ [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; meta = { description = "A suite of SGML/XML processing tools"; From d2da94cc0bd8555b99bc54e2654208b5eeb54d94 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 24 Oct 2014 02:35:07 +0200 Subject: [PATCH 041/127] cygwin: zlib - we do not --disable-shared --- pkgs/development/libraries/zlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 162bae54d377..419a2584ca84 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation (rec { makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ]; }; - # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. - cygwinConfigureEnableShared = true; + # CYGXXX: This is not needed anymore and non-functional, but left not to trigger rebuilds + cygwinConfigureEnableShared = if (!stdenv.isCygwin) then true else null; passthru.version = version; From 5f4a9c3391bad23ffbb3e0a3b740115b7ebee11e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 23 Oct 2014 21:25:57 +0200 Subject: [PATCH 042/127] cygwin: python-2.7 --- .../2.7/2.5.2-ctypes-util-find_library.patch | 34 ++++++++++++++ .../python/2.7/2.5.2-tkinter-x11.patch | 27 +++++++++++ .../python/2.7/2.6.2-ssl-threads.patch | 13 ++++++ .../python/2.7/2.6.5-FD_SETSIZE.patch | 41 +++++++++++++++++ .../2.6.5-export-PySignal_SetWakeupFd.patch | 11 +++++ .../python/2.7/2.6.5-ncurses-abi6.patch | 16 +++++++ .../interpreters/python/2.7/2.7.3-dbm.patch | 27 +++++++++++ .../interpreters/python/2.7/2.7.3-dylib.patch | 10 +++++ .../2.7/2.7.3-getpath-exe-extension.patch | 31 +++++++++++++ .../python/2.7/2.7.3-no-libm.patch | 11 +++++ .../2.7/2.7.5-export-PyNode_SizeOf.patch | 13 ++++++ .../interpreters/python/2.7/default.nix | 45 ++++++++++++++----- 12 files changed, 268 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch create mode 100644 pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch b/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch new file mode 100644 index 000000000000..22bc0f7ced0a --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch @@ -0,0 +1,34 @@ +--- origsrc/Lib/ctypes/util.py 2007-09-14 15:05:26.000000000 -0500 ++++ src/Lib/ctypes/util.py 2008-11-25 17:54:47.319296200 -0600 +@@ -41,6 +41,20 @@ + continue + return None + ++elif sys.platform == "cygwin": ++ def find_library(name): ++ for libdir in ['/usr/lib', '/usr/local/lib']: ++ for libext in ['lib%s.dll.a' % name, 'lib%s.a' % name]: ++ implib = os.path.join(libdir, libext) ++ if not os.path.exists(implib): ++ continue ++ cmd = "dlltool -I " + implib + " 2>/dev/null" ++ res = os.popen(cmd).read().replace("\n","") ++ if not res: ++ continue ++ return res ++ return None ++ + elif os.name == "posix": + # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump + import re, tempfile, errno +@@ -157,6 +173,10 @@ + print cdll.LoadLibrary("libcrypto.dylib") + print cdll.LoadLibrary("libSystem.dylib") + print cdll.LoadLibrary("System.framework/System") ++ elif sys.platform == "cygwin": ++ print cdll.LoadLibrary("cygbz2-1.dll") ++ print find_library("crypt") ++ print cdll.LoadLibrary("cygcrypt-0.dll") + else: + print cdll.LoadLibrary("libm.so") + print cdll.LoadLibrary("libcrypt.so") diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch b/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch new file mode 100644 index 000000000000..28b6dafc3f15 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch @@ -0,0 +1,27 @@ +--- origsrc/setup.py 2008-02-04 17:41:02.000000000 -0600 ++++ src/setup.py 2008-07-02 02:11:28.671875000 -0500 +@@ -1277,12 +1279,6 @@ + include_dirs.append('/usr/X11/include') + added_lib_dirs.append('/usr/X11/lib') + +- # If Cygwin, then verify that X is installed before proceeding +- if host_platform == 'cygwin': +- x11_inc = find_file('X11/Xlib.h', [], include_dirs) +- if x11_inc is None: +- return +- + # Check for BLT extension + if self.compiler.find_library_file(lib_dirs + added_lib_dirs, + 'BLT8.0'): +@@ -1300,9 +1296,8 @@ + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') ++ # Finally, link with the X11 libraries ++ libs.append('X11') + + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, diff --git a/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch b/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch new file mode 100644 index 000000000000..bef137efda7b --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch @@ -0,0 +1,13 @@ +--- origsrc/Modules/_ssl.c 2009-01-26 10:55:41.000000000 -0600 ++++ src/Modules/_ssl.c 2009-08-20 00:04:59.346816700 -0500 +@@ -15,6 +15,10 @@ + + #include "Python.h" + ++#ifdef __CYGWIN__ ++#undef WITH_THREAD ++#endif ++ + #ifdef WITH_THREAD + #include "pythread.h" + #define PySSL_BEGIN_ALLOW_THREADS { \ diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch b/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch new file mode 100644 index 000000000000..d1dae8c47dc1 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch @@ -0,0 +1,41 @@ +--- Python-2.6.5.orig/Modules/selectmodule.c 2012-02-02 22:35:21.835125000 -0500 ++++ Python-2.6.5/Modules/selectmodule.c 2012-02-02 22:41:41.210125000 -0500 +@@ -6,6 +6,21 @@ + >= 0. + */ + ++/* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined. ++ 64 is too small (too many people have bumped into that limit). ++ Here we boost it. ++ ++ Cygwin also defines FD_SETSIZE to 64, so also increase the limit on ++ Cygwin. We must do this before sys/types.h is included, which otherwise ++ sets FD_SETSIZE to the default. ++ ++ Users who want even more than the boosted limit should #define ++ FD_SETSIZE higher before this; e.g., via compiler /D switch. ++*/ ++#if (defined(MS_WINDOWS) || defined(__CYGWIN__)) && !defined(FD_SETSIZE) ++#define FD_SETSIZE 512 ++#endif ++ + #include "Python.h" + #include + +@@ -16,16 +31,6 @@ + #undef HAVE_BROKEN_POLL + #endif + +-/* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined. +- 64 is too small (too many people have bumped into that limit). +- Here we boost it. +- Users who want even more than the boosted limit should #define +- FD_SETSIZE higher before this; e.g., via compiler /D switch. +-*/ +-#if defined(MS_WINDOWS) && !defined(FD_SETSIZE) +-#define FD_SETSIZE 512 +-#endif +- + #if defined(HAVE_POLL_H) + #include + #elif defined(HAVE_SYS_POLL_H) diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch b/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch new file mode 100644 index 000000000000..ea696978236a --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch @@ -0,0 +1,11 @@ +--- origsrc/Include/pyerrors.h 2008-06-08 23:58:54.000000000 -0500 ++++ src/Include/pyerrors.h 2010-05-12 04:19:31.535297200 -0500 +@@ -232,7 +232,7 @@ PyAPI_FUNC(int) PyErr_CheckSignals(void) + PyAPI_FUNC(void) PyErr_SetInterrupt(void); + + /* In signalmodule.c */ +-int PySignal_SetWakeupFd(int fd); ++PyAPI_FUNC(int) PySignal_SetWakeupFd(int fd); + + /* Support for adding program text to SyntaxErrors */ + PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int); diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch b/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch new file mode 100644 index 000000000000..e1cf5ad4bbf9 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch @@ -0,0 +1,16 @@ +--- origsrc/Include/py_curses.h 2009-09-06 16:23:05.000000000 -0500 ++++ src/Include/py_curses.h 2010-04-14 15:21:23.008971400 -0500 +@@ -17,6 +17,13 @@ + #define NCURSES_OPAQUE 0 + #endif /* __APPLE__ */ + ++#ifdef __CYGWIN__ ++/* the following define is necessary for Cygwin; without it, the ++ Cygwin-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python ++ can't get at the WINDOW flags field. */ ++#define NCURSES_INTERNALS ++#endif /* __CYGWIN__ */ ++ + #ifdef __FreeBSD__ + /* + ** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch b/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch new file mode 100644 index 000000000000..bfaeb37c287d --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch @@ -0,0 +1,27 @@ +--- origsrc/setup.py.orig 2012-11-27 10:20:47.442395900 -0500 ++++ src/setup.py 2012-11-27 10:53:15.583020900 -0500 +@@ -1141,7 +1141,7 @@ + + dbm_order = ['gdbm'] + # The standard Unix dbm module: +- if host_platform not in ['cygwin']: ++ if host_platform not in ['win32']: + config_args = [arg.strip("'") + for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] + dbm_args = [arg for arg in config_args +@@ -1192,6 +1192,15 @@ + ], + libraries = gdbm_libs) + break ++ if find_file("ndbm.h", inc_dirs, []) is not None: ++ print("building dbm using gdbm") ++ dbmext = Extension( ++ 'dbm', ['dbmmodule.c'], ++ define_macros=[ ++ ('HAVE_NDBM_H', None), ++ ], ++ libraries = gdbm_libs) ++ break + elif cand == "bdb": + if db_incs is not None: + print "building dbm using bdb" diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch b/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch new file mode 100644 index 000000000000..6e1fc8b53e83 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch @@ -0,0 +1,10 @@ +--- origsrc/Lib/distutils/unixccompiler.py.orig 2012-11-27 07:44:15.409993500 -0500 ++++ src/Lib/distutils/unixccompiler.py 2012-11-27 08:09:57.801770900 -0500 +@@ -141,6 +141,7 @@ + static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s" + if sys.platform == "cygwin": + exe_extension = ".exe" ++ dylib_lib_extension = ".dll.a" + + def preprocess(self, source, + output_file=None, macros=None, include_dirs=None, diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch b/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch new file mode 100644 index 000000000000..68f6921ba6aa --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch @@ -0,0 +1,31 @@ +--- origsrc/Modules/getpath.c.orig 2012-11-27 12:07:56.098645900 -0500 ++++ src/Modules/getpath.c 2012-11-27 12:10:11.254895900 -0500 +@@ -436,6 +436,28 @@ + if (isxfile(progpath)) + break; + ++#ifdef __CYGWIN__ ++ /* ++ * Cygwin automatically removes the ".exe" extension from argv[0] ++ * to make programs feel like they are in a more Unix-like ++ * environment. Unfortunately, this can make it problemmatic for ++ * Cygwin to distinguish between a directory and an executable with ++ * the same name excluding the ".exe" extension. For example, the ++ * Cygwin Python build directory has a "Python" directory and a ++ * "python.exe" executable. This causes isxfile() to erroneously ++ * return false. If isdir() returns true and there is enough space ++ * to append the ".exe" extension, then we try again with the ++ * extension appended. ++ */ ++#define EXE ".exe" ++ if (isdir(progpath) && strlen(progpath) + strlen(EXE) <= MAXPATHLEN) ++ { ++ strcat(progpath, EXE); ++ if (isxfile(progpath)) ++ break; ++ } ++#endif /* __CYGWIN__ */ ++ + if (!delim) { + progpath[0] = '\0'; + break; diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch b/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch new file mode 100644 index 000000000000..55281db6768f --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch @@ -0,0 +1,11 @@ +--- origsrc/setup.py.orig 2012-11-27 09:28:34.051770900 -0500 ++++ src/setup.py 2012-11-27 09:28:47.239270900 -0500 +@@ -470,7 +470,7 @@ + + # Check for MacOS X, which doesn't need libm.a at all + math_libs = ['m'] +- if host_platform in ['darwin', 'beos']: ++ if host_platform in ['darwin', 'beos', 'cygwin']: + math_libs = [] + + # XXX Omitted modules: gl, pure, dl, SGI-specific modules diff --git a/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch b/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch new file mode 100644 index 000000000000..e5efd6266902 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch @@ -0,0 +1,13 @@ +For the parser extension + +--- origsrc/Include/node.h 2013-05-11 22:32:41.000000000 -0500 ++++ src/Include/node.h 2013-06-04 02:55:03.949347500 -0500 +@@ -21,7 +21,7 @@ PyAPI_FUNC(int) PyNode_AddChild(node *n, + char *str, int lineno, int col_offset); + PyAPI_FUNC(void) PyNode_Free(node *n); + #ifndef Py_LIMITED_API +-Py_ssize_t _PyNode_SizeOf(node *n); ++PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n); + #endif + + /* Node access functions */ diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 2b9e3c3736ba..eebd4514571e 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -7,6 +7,7 @@ , tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true , zlib ? null, zlibSupport ? true +, expat, libffi }: assert zlibSupport -> zlib != null; @@ -39,6 +40,18 @@ let # patch python to put zero timestamp into pyc # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch + ] ++ optionals stdenv.isCygwin [ + ./2.5.2-ctypes-util-find_library.patch + ./2.5.2-tkinter-x11.patch + ./2.6.2-ssl-threads.patch + ./2.6.5-export-PySignal_SetWakeupFd.patch + ./2.6.5-FD_SETSIZE.patch + ./2.6.5-ncurses-abi6.patch + ./2.7.3-dbm.patch + ./2.7.3-dylib.patch + ./2.7.3-getpath-exe-extension.patch + ./2.7.3-no-libm.patch + ./2.7.5-export-PyNode_SizeOf.patch ]; preConfigure = '' @@ -50,19 +63,26 @@ let for i in Lib/plat-*/regen; do substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ done - '' + optionalString stdenv.isCygwin '' - # On Cygwin, `make install' tries to read this Makefile. - mkdir -p $out/lib/python${majorVersion}/config - touch $out/lib/python${majorVersion}/config/Makefile - mkdir -p $out/include/python${majorVersion} - touch $out/include/python${majorVersion}/pyconfig.h ''; - configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; + configureFlags = [ + "--enable-shared" + "--with-threads" + "--enable-unicode=ucs4" + ] ++ optionals stdenv.isCygwin [ + "--with-system-ffi" + "--with-system-expat" + "ac_cv_func_bind_textdomain_codeset=yes" + ]; + + postConfigure = if stdenv.isCygwin then '' + sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),' + '' else null; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl ] + ++ optionals stdenv.isCygwin [ expat libffi ] ++ optionals includeModules ( [ db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk x11 libX11 ] @@ -150,14 +170,17 @@ let if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches preConfigure configureFlags; + inherit src patches preConfigure postConfigure configureFlags; buildInputs = [ python ] ++ deps; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - buildPhase = '' + # non-python gdbm has a libintl dependency on i686-cygwin, not on x86_64-cygwin + buildPhase = (if (stdenv.system == "i686-cygwin" && moduleName == "gdbm") then '' + sed -i setup.py -e "s:libraries = \['gdbm'\]:libraries = ['gdbm', 'intl']:" + '' else '''') + '' substituteInPlace setup.py --replace 'self.extensions = extensions' \ 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' @@ -212,10 +235,10 @@ let } // optionalAttrs x11Support { - tkinter = buildInternalPythonModule { + tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 libX11 ]; - }; + }); } // { From 2876b726bdd8070c3dbc2d01cae7318de854fae0 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 24 Oct 2014 03:16:12 +0200 Subject: [PATCH 043/127] cygwin: currently no libsigsegv for x86_64-cygwin --- pkgs/tools/text/gawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 35e0b6d927b2..c6eb7ba11019 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 - buildInputs = [ libsigsegv ] + buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv ++ stdenv.lib.optional readlineSupport readline; - configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ] + configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}" ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}" # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv) ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline"; From 7f7aca4e16fc66c6900f0dc6ed03894fd079eec8 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 24 Oct 2014 17:20:39 +0200 Subject: [PATCH 044/127] cygwin: asciidoc otherwise tries to install to //nix and fails on cygwin '//' on cygwin is the beginning of a SAMBA path --- pkgs/tools/typesetting/asciidoc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 370f0efb32a0..81a457d0d2d5 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -255,6 +255,7 @@ stdenv.mkDerivation rec { ''; preInstall = "mkdir -p $out/etc/vim"; + makeFlags = if stdenv.isCygwin then "DESTDIR=/." else null; meta = with stdenv.lib; { description = "Text-based document generation system"; From 6c7899b1f6a376f6a666060e095bab7f226c7f55 Mon Sep 17 00:00:00 2001 From: "U-user-PC\\\\user" Date: Sun, 26 Oct 2014 15:27:39 +0100 Subject: [PATCH 045/127] cygwin: popt patches --- .../libraries/popt/1.16-cygwin.patch | 11 ++++++ .../libraries/popt/1.16-vpath.patch | 34 +++++++++++++++++++ pkgs/development/libraries/popt/default.nix | 7 +++- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/popt/1.16-cygwin.patch create mode 100644 pkgs/development/libraries/popt/1.16-vpath.patch diff --git a/pkgs/development/libraries/popt/1.16-cygwin.patch b/pkgs/development/libraries/popt/1.16-cygwin.patch new file mode 100644 index 000000000000..9c084f0b8eaa --- /dev/null +++ b/pkgs/development/libraries/popt/1.16-cygwin.patch @@ -0,0 +1,11 @@ +--- origsrc/poptconfig.c 2009-05-20 08:18:07.000000000 -0500 ++++ src/poptconfig.c 2012-03-29 18:13:46.869286100 -0500 +@@ -42,7 +42,7 @@ extern int glob_pattern_p (const char *_ + /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/ + #endif /* __LCLINT__ */ + +-#if !defined(__GLIBC__) ++#if !defined(__GLIBC__) && !defined(__CYGWIN__) + /* Return nonzero if PATTERN contains any metacharacters. + Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ + static int diff --git a/pkgs/development/libraries/popt/1.16-vpath.patch b/pkgs/development/libraries/popt/1.16-vpath.patch new file mode 100644 index 000000000000..4cfa1c8fb4db --- /dev/null +++ b/pkgs/development/libraries/popt/1.16-vpath.patch @@ -0,0 +1,34 @@ +--- origsrc/Doxyfile.in 2008-04-26 16:57:32.000000000 -0500 ++++ src/Doxyfile.in 2012-03-29 18:15:56.649709100 -0500 +@@ -460,14 +460,14 @@ WARN_LOGFILE = + # with spaces. + + INPUT = \ +- ./popt.c \ +- ./popt.h \ +- ./poptconfig.c \ +- ./popthelp.c \ +- ./poptint.c \ +- ./poptint.h \ +- ./poptparse.c \ +- ./system.h ++ @srcdir@/popt.c \ ++ @srcdir@/popt.h \ ++ @srcdir@/poptconfig.c \ ++ @srcdir@/popthelp.c \ ++ @srcdir@/poptint.c \ ++ @srcdir@/poptint.h \ ++ @srcdir@/poptparse.c \ ++ @srcdir@/system.h + + # If the value of the INPUT tag contains directories, you can use the + # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +@@ -658,7 +658,7 @@ HTML_HEADER = + # each generated HTML page. If it is left blank doxygen will generate a + # standard footer. + +-HTML_FOOTER = footer_no_timestamp.html ++HTML_FOOTER = @srcdir@/footer_no_timestamp.html + + # The HTML_STYLESHEET tag can be used to specify a user-defined cascading + # style sheet that is used by each HTML page. It can be used to diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 03f917daa23f..f99514f054a5 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -2,12 +2,17 @@ stdenv.mkDerivation rec { name = "popt-1.16"; - + src = fetchurl { url = "http://rpm5.org/files/popt/${name}.tar.gz"; sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; }; + patches = if stdenv.isCygwin then [ + ./1.16-cygwin.patch + ./1.16-vpath.patch + ] else null; + meta = { description = "command line option parsing library"; }; From 12b781a945aa4c6c8d95f36161780f693a43c73d Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 26 Oct 2014 19:37:09 +0100 Subject: [PATCH 046/127] cygwin: zip --- pkgs/tools/archivers/zip/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 92d8a22fa476..e4da0236cdfe 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null }: +{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null, libiconv }: assert enableNLS -> libnatspec != null; @@ -13,13 +13,16 @@ stdenv.mkDerivation { sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; + # should be makeFlags on all archs, not changed yet to prevent rebuild buildFlags="-f unix/Makefile generic"; + makeFlags = if stdenv.isCygwin then "-f unix/Makefile ${if stdenv.isCygwin then "cygwin" else "generic"}" else null; installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp"; - patches = if enableNLS then [ ./natspec-gentoo.patch.bz2 ] else []; + patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; - buildInputs = if enableNLS then [ libnatspec ] else []; + buildInputs = stdenv.lib.optional enableNLS libnatspec + ++ stdenv.lib.optional stdenv.isCygwin libiconv; meta = { description = "Compressor/archiver for creating and modifying zipfiles"; From 90a97d32df1a7809d755c47ed84c25fd2d46b4fe Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 29 Oct 2014 23:44:53 +0100 Subject: [PATCH 047/127] cygwin cmake --- .../build-managers/cmake/2.8.11-cygwin.patch | 237 ++++++++++++++++++ .../tools/build-managers/cmake/default.nix | 4 +- 2 files changed, 239 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch diff --git a/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch b/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch new file mode 100644 index 000000000000..e16dab32632f --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch @@ -0,0 +1,237 @@ +--- cmake-2.8.10/Source/cmFileCommand.cxx 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/cmFileCommand.cxx 2013-03-16 22:55:11.306681100 -0500 +@@ -1002,7 +1002,7 @@ protected: + MatchProperties CollectMatchProperties(const char* file) + { + // Match rules are case-insensitive on some platforms. +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + std::string lower = cmSystemTools::LowerCase(file); + const char* file_to_match = lower.c_str(); + #else +--- cmake-2.8.10/Source/cmInstallCommand.cxx 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/cmInstallCommand.cxx 2013-03-16 22:56:21.008667800 -0500 +@@ -1090,7 +1090,7 @@ cmInstallCommand::HandleDirectoryMode(st + { + literal_args += " REGEX \""; + // Match rules are case-insensitive on some platforms. +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + std::string regex = cmSystemTools::LowerCase(args[i]); + #else + std::string regex = args[i]; +--- cmake-2.8.10/Source/kwsys/Glob.cxx 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/kwsys/Glob.cxx 2013-03-16 22:58:54.192429400 -0500 +@@ -37,7 +37,7 @@ + #include + namespace KWSYS_NAMESPACE + { +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + // On Windows and apple, no difference between lower and upper case + # define KWSYS_GLOB_CASE_INDEPENDENT + #endif +--- cmake-2.8.11/Source/kwsys/SystemInformation.cxx 2013-05-15 12:38:13.000000000 -0500 ++++ cmake-2.8.11/Source/kwsys/SystemInformation.cxx 2013-07-08 01:57:31.216321800 -0500 +@@ -888,7 +888,7 @@ void SystemInformation::RunMemoryCheck() + // Hide implementation details in an anonymous namespace. + namespace { + // ***************************************************************************** +-#if defined(__linux) || defined(__APPLE__) ++#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) + int LoadLines( + FILE *file, + kwsys_stl::vector &lines) +@@ -918,7 +918,7 @@ int LoadLines( + return nRead; + } + +-# if defined(__linux) ++# if defined(__linux) || defined(__CYGWIN__) + // ***************************************************************************** + int LoadLines( + const char *fileName, +@@ -957,7 +957,7 @@ int NameValue( + } + #endif + +-#if defined(__linux) ++#if defined(__linux) || defined(__CYGWIN__) + // **************************************************************************** + template + int GetFieldsFromFile( +@@ -2869,7 +2869,6 @@ bool SystemInformationImplementation::Re + pos = buffer.find("processor\t",pos+1); + } + +-#ifdef __linux + // Find the largest physical id. + int maxId = -1; + kwsys_stl::string idc = +@@ -2893,14 +2892,6 @@ bool SystemInformationImplementation::Re + this->NumberOfPhysicalCPU=static_cast( + numberOfCoresPerCPU*(maxId+1)); + +-#else // __CYGWIN__ +- // does not have "physical id" entries, neither "cpu cores" +- // this has to be fixed for hyper-threading. +- kwsys_stl::string cpucount = +- this->ExtractValueFromCpuInfoFile(buffer,"cpu count"); +- this->NumberOfPhysicalCPU= +- this->NumberOfLogicalCPU = atoi(cpucount.c_str()); +-#endif + // gotta have one, and if this is 0 then we get a / by 0n + // better to have a bad answer than a crash + if(this->NumberOfPhysicalCPU <= 0) +@@ -3086,7 +3077,7 @@ SystemInformationImplementation::GetHost + GlobalMemoryStatusEx(&statex); + return statex.ullTotalPhys/1024; + # endif +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + SystemInformation::LongLong memTotal=0; + int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal); + if (ierr) +@@ -3217,7 +3208,7 @@ SystemInformationImplementation::GetHost + GlobalMemoryStatusEx(&statex); + return (statex.ullTotalPhys - statex.ullAvailPhys)/1024; + # endif +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + const char *names[3]={"MemTotal:","MemFree:",NULL}; + SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)}; + int ierr=GetFieldsFromFile("/proc/meminfo",names,values); +@@ -3276,7 +3267,7 @@ SystemInformationImplementation::GetProc + return -2; + } + return pmc.WorkingSetSize/1024; +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + SystemInformation::LongLong memUsed=0; + int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed); + if (ierr) +@@ -3328,7 +3319,7 @@ SystemInformationImplementation::GetProc + { + #if defined(_WIN32) + return GetCurrentProcessId(); +-#elif defined(__linux) || defined(__APPLE__) ++#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) + return getpid(); + #else + return -1; +--- cmake-2.8.10/Source/kwsys/SystemTools.cxx 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/kwsys/SystemTools.cxx 2013-03-16 22:52:11.830415600 -0500 +@@ -75,19 +75,12 @@ + // Windows API. + #if defined(_WIN32) + # include +-#elif defined (__CYGWIN__) +-# include +-# undef _WIN32 + #endif + + #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H + extern char **environ; + #endif + +-#ifdef __CYGWIN__ +-extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path); +-#endif +- + // getpwnam doesn't exist on Windows and Cray Xt3/Catamount + // same for TIOCGWINSZ + #if defined(_WIN32) || defined (__LIBCATAMOUNT__) +@@ -1068,7 +1061,7 @@ bool SystemTools::SameFile(const char* f + } + + //---------------------------------------------------------------------------- +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + static bool WindowsFileExists(const char* filename) + { + WIN32_FILE_ATTRIBUTE_DATA fd; +@@ -1083,7 +1076,7 @@ bool SystemTools::FileExists(const char* + { + return false; + } +-#if defined(__CYGWIN__) ++#if 0 + // Convert filename to native windows path if possible. + char winpath[MAX_PATH]; + if(SystemTools::PathCygwinToWin32(filename, winpath)) +@@ -1111,7 +1104,7 @@ bool SystemTools::FileExists(const char* + } + + //---------------------------------------------------------------------------- +-#ifdef __CYGWIN__ ++#if 0 + bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path) + { + SystemToolsTranslationMap::iterator i = +@@ -3894,7 +3887,7 @@ bool SystemTools::LocateFileInDir(const + bool SystemTools::FileIsFullPath(const char* in_name) + { + kwsys_stl::string name = in_name; +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + // On Windows, the name must be at least two characters long. + if(name.length() < 2) + { +@@ -4712,9 +4705,6 @@ bool SystemTools::ParseURL( const kwsys_ + unsigned int SystemToolsManagerCount; + SystemToolsTranslationMap *SystemTools::TranslationMap; + SystemToolsTranslationMap *SystemTools::LongPathMap; +-#ifdef __CYGWIN__ +-SystemToolsTranslationMap *SystemTools::Cyg2Win32Map; +-#endif + + // SystemToolsManager manages the SystemTools singleton. + // SystemToolsManager should be included in any translation unit +@@ -4760,9 +4750,6 @@ void SystemTools::ClassInitialize() + // Allocate the translation map first. + SystemTools::TranslationMap = new SystemToolsTranslationMap; + SystemTools::LongPathMap = new SystemToolsTranslationMap; +-#ifdef __CYGWIN__ +- SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap; +-#endif + + // Add some special translation paths for unix. These are not added + // for windows because drive letters need to be maintained. Also, +@@ -4817,9 +4804,6 @@ void SystemTools::ClassFinalize() + { + delete SystemTools::TranslationMap; + delete SystemTools::LongPathMap; +-#ifdef __CYGWIN__ +- delete SystemTools::Cyg2Win32Map; +-#endif + } + + +--- cmake-2.8.10/Source/kwsys/SystemTools.hxx.in 2012-10-31 10:32:06.000000000 -0500 ++++ cmake-2.8.10/Source/kwsys/SystemTools.hxx.in 2013-03-16 23:10:30.185237900 -0500 +@@ -277,15 +277,6 @@ public: + static bool FileExists(const char* filename); + + /** +- * Converts Cygwin path to Win32 path. Uses dictionary container for +- * caching and calls to cygwin_conv_to_win32_path from Cygwin dll +- * for actual translation. Returns true on success, else false. +- */ +-#ifdef __CYGWIN__ +- static bool PathCygwinToWin32(const char *path, char *win32_path); +-#endif +- +- /** + * Return file length + */ + static unsigned long FileLength(const char *filename); +@@ -887,9 +878,6 @@ private: + */ + static SystemToolsTranslationMap *TranslationMap; + static SystemToolsTranslationMap *LongPathMap; +-#ifdef __CYGWIN__ +- static SystemToolsTranslationMap *Cyg2Win32Map; +-#endif + friend class SystemToolsManager; + }; + diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 45bdeece45e7..9f2ed0a73524 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { url = "http://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }); + }) ++ stdenv.lib.optional stdenv.isCygwin ./2.8.11-cygwin.patch; buildInputs = [ bzip2 curl expat libarchive xz zlib ] @@ -52,8 +52,8 @@ stdenv.mkDerivation rec { [ "--docdir=/share/doc/${name}" "--mandir=/share/man" - "--system-libs" ] + ++ optional (!stdenv.isCygwin) "--system-libs" ++ optional (jsoncpp == null) "--no-system-jsoncpp" ++ optional useQt4 "--qt-gui" ++ ["--"] From d6c4963bcb9d1f560838c216d2ca18a759ee65be Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 29 Oct 2014 23:45:15 +0100 Subject: [PATCH 048/127] cygwin libarchive --- pkgs/development/libraries/libarchive/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index f0c3c0632a95..076d22402772 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; + preBuild = if stdenv.isCygwin then '' + echo "#include " >> config.h + '' else null; + meta = { description = "Multi-format archive and compression library"; longDescription = '' From a02799cd78dcb8d956d13b57d0644c5a69e46f92 Mon Sep 17 00:00:00 2001 From: Marko Durkovic Date: Fri, 7 Nov 2014 14:42:59 +0100 Subject: [PATCH 049/127] cygwin: fix ncurses 1. Fix linking against ncurses.dll 2. Fix segfaults with threaded code --- .../development/libraries/ncurses/default.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 4409dfc4eca7..f0519fa981df 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -49,6 +49,15 @@ stdenv.mkDerivation rec { (mkEnable unicode "widec" null) (mkEnable true "ext-colors" null) (mkEnable true "ext-mouse" null) + ] ++ stdenv.lib.optionals stdenv.isCygwin [ + "--enable-sp-funcs" + "--enable-term-driver" + "--enable-const" + "--enable-ext-colors" + "--enable-ext-mouse" + "--enable-reentrant" + "--enable-colorfgbg" + "--enable-tcap-names" ]; # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this @@ -60,6 +69,8 @@ stdenv.mkDerivation rec { preConfigure = '' export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig" mkdir -p "$PKG_CONFIG_LIBDIR" + '' + stdenv.lib.optionalString stdenv.isCygwin '' + sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure ''; selfNativeBuildInput = true; @@ -71,7 +82,7 @@ stdenv.mkDerivation rec { # When building a wide-character (Unicode) build, create backward # compatibility links from the the "normal" libraries to the # wide-character libraries (e.g. libncurses.so to libncursesw.so). - postInstall = if unicode then '' + postInstall = if unicode then ('' # Create a non-abi versioned config cfg=$(basename $out/bin/ncurses*-config) ln -svf $cfg $out/bin/ncursesw-config @@ -95,7 +106,13 @@ stdenv.mkDerivation rec { # Create curses compatability ln -svf libncursesw.so $out/lib/libcursesw.so ln -svf libncursesw.so $out/lib/libcurses.so - '' else '' + '' + stdenv.lib.optionalString stdenv.isCygwin '' + for lib in $libs; do + if test -e $out/lib/lib''${lib}w.dll.a; then + ln -svf lib''${lib}w.dll.a $out/lib/lib$lib.dll.a + fi + done + '') else '' # Create a non-abi versioned config cfg=$(basename $out/bin/ncurses*-config) ln -svf $cfg $out/bin/ncurses-config From 29475103be8934140e4c6e19cb3af560376e3d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 28 May 2015 11:10:08 +0200 Subject: [PATCH 050/127] gnome3.anjuta: fix hash /cc @lethalman. I've got no idea if the hash has changed upstream or what. I thought it remained from 3.12 version of anjuta, but that was a different hash. --- pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix index a55adf6d9759..35315f67cad2 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz"; - sha256 = "b1aac2d4c35891b23c9bc3f168bf2845e02d0a438742478c98e450950d82b5e5"; + sha256 = "0g4lv6rzkwfz2wp4fg97qlbvyfh2k9gl7k7lidazaikvnc0jlhvp"; }; enableParallelBuilding = true; From afea09936e4aae232e6c63794bb851d173f0fa90 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 26 May 2015 01:56:24 -0700 Subject: [PATCH 051/127] rocksdb: 3.10 -> 3.11 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 88d94ec0f2cb..9a720a35ff03 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "3.10"; + version = "3.11"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "1px345x9cyaxyjlzsf3bcxixvfaxn9x3ysq7biajyfhk8wq1n4p0"; + sha256 = "06gf0k6hjarc7iw0w0p8814d27f8vrc3s0laarh7qdd4wshw02s8"; }; buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ]; From 4389ae5208ec9b7e80b3b0e4ee10e2709333519f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 26 May 2015 02:45:34 -0700 Subject: [PATCH 052/127] libverto: Add derivation --- .../libraries/libverto/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/libverto/default.nix diff --git a/pkgs/development/libraries/libverto/default.nix b/pkgs/development/libraries/libverto/default.nix new file mode 100644 index 000000000000..e4097aa57d6f --- /dev/null +++ b/pkgs/development/libraries/libverto/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig + +# Optional Dependencies +, glib ? null, libev ? null, libevent ? null, tevent ? null, talloc ? null +}: +with stdenv; +let + optGlib = shouldUsePkg glib; + optLibev = shouldUsePkg libev; + optLibevent = shouldUsePkg libevent; + optTevent = shouldUsePkg tevent; + optTalloc = shouldUsePkg talloc; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "libverto-0.2.6"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/l/i/libverto/${name}.tar.gz"; + sha256 = "17hwr55ga0rkm5cnyfiipyrk9n372x892ph9wzi88j2zhnisdv0p"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ optGlib optLibev optLibevent ] + ++ optionals (optTevent != null && optTalloc != null) [ + optTevent optTalloc + ]; + + postInstall = '' + # In v0.2.6 the shipped pkg-config files have an out of order + # declaration of exec_prefix breaking them. This fixes that issue + sed -i 's,''${exec_prefix},''${prefix},g' $out/lib/pkgconfig/*.pc + ''; + + meta = { + homepage = https://fedorahosted.org/libverto/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60cffbbf4d95..1d9ac42ac3a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7170,6 +7170,10 @@ let libvdpau = callPackage ../development/libraries/libvdpau { }; + libverto = callPackage ../development/libraries/libverto { + glib = null; # Don't include fairly heavy dependency + }; + libvirt = callPackage ../development/libraries/libvirt { }; libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; From 85932bc5a998060e76090273b51d35133a7a2dbb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 May 2015 00:53:47 -0700 Subject: [PATCH 053/127] krb5: 1.13.1 -> 1.13.2 --- .../core/gnome-control-center/default.nix | 4 +- pkgs/development/compilers/hhvm/default.nix | 4 +- pkgs/development/libraries/kerberos/krb5.nix | 120 +++++++++++++++--- pkgs/development/libraries/ti-rpc/default.nix | 4 +- pkgs/tools/system/rsyslog/default.nix | 6 +- pkgs/top-level/all-packages.nix | 3 + 6 files changed, 115 insertions(+), 26 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index c425f41e8e1f..725aa6a6b128 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -2,7 +2,7 @@ , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, pulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, krb5, networkmanagerapplet, networkmanager +, cracklib, python, libkrb5, networkmanagerapplet, networkmanager , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile + accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gnome3.vino udev libcanberra_gtk3 diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 72bdabb4349d..a55861175882 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c -, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5 +, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng , libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit , libvpx, imagemagick, fribidi @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5 + libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5 gmp libyaml libedit libvpx imagemagick fribidi ]; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 41c570ee554e..c60ff03aa67a 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,41 +1,127 @@ -{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }: +{ stdenv, fetchurl, pkgconfig, perl +, yacc, bootstrap_cmds +# Optional Dependencies +, libedit ? null, readline ? null, ncurses ? null, libverto ? null +, openldap ? null, db ? null + +# Crypto Dependencies +, openssl ? null, nss ? null, nspr ? null + +# Extra Arguments +, prefix ? "" +}: + +with stdenv; let - pname = "krb5"; - version = "1.13.1"; - name = "${pname}-${version}"; - webpage = http://web.mit.edu/kerberos/; -in + libOnly = prefix == "lib"; -stdenv.mkDerivation (rec { - inherit name; + optOpenssl = shouldUsePkg openssl; + optNss = shouldUsePkg nss; + optNspr = shouldUsePkg nspr; + optLibedit = if libOnly then null else shouldUsePkg libedit; + optReadline = if libOnly then null else shouldUsePkg readline; + optNcurses = if libOnly then null else shouldUsePkg ncurses; + optLibverto = shouldUsePkg libverto; + optOpenldap = if libOnly then null else shouldUsePkg openldap; + optDb = if libOnly then null else shouldUsePkg db; + + # Prefer the openssl implementation + cryptoStr = if optOpenssl != null then "openssl" + else if optNss != null && optNspr != null then "nss" + else "builtin"; + + cryptoInputs = { + "openssl" = [ optOpenssl ]; + "nss" = [ optNss optNspr ]; + "builtin" = [ ]; + }.${cryptoStr}; + + tlsStr = if optOpenssl != null then "openssl" + else "no"; + + tlsInputs = { + "openssl" = [ optOpenssl ]; + "no" = [ ]; + }.${tlsStr}; + + # Libedit is less buggy in krb5, readline breaks tests + lineParserStr = if optLibedit != null then "libedit" + else if optReadline != null && optNcurses != null then "readline" + else "no"; + + lineParserInputs = { + "libedit" = [ optLibedit ]; + "readline" = [ optReadline optNcurses ]; + "no" = [ ]; + }.${lineParserStr}; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "${prefix}krb5-${version}"; + version = "1.13.2"; src = fetchurl { - url = "${webpage}dist/krb5/1.13/${name}-signed.tar"; - sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd"; + url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar"; + sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75"; }; - buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ] + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ yacc optOpenssl optLibverto optOpenldap ] + ++ cryptoInputs ++ tlsInputs ++ lineParserInputs # Provides the mig command used by the build scripts - ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ; + ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds; unpackPhase = '' tar -xf $src - tar -xzf ${name}.tar.gz - cd ${name}/src + tar -xzf krb5-${version}.tar.gz + cd krb5-${version}/src ''; - configureFlags = [ "--with-tcl=no" ]; + configureFlags = [ + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkEnable false "athena" null) + (mkWith false "vague-errors" null) + (mkWith true "crypto-impl" cryptoStr) + (mkWith true "pkinit-crypto-impl" cryptoStr) + (mkWith true "tls-impl" tlsStr) + (mkEnable true "aesni" null) + (mkEnable true "kdc-lookaside-cache" null) + (mkEnable (optOpenssl != null) "pkinit" null) + (mkWith (lineParserStr == "libedit") "libedit" null) + (mkWith (lineParserStr == "readline") "readline" null) + (mkWith (optLibverto != null) "system-verto" null) + (mkWith (optOpenldap != null) "ldap" null) + (mkWith false "tcl" null) + (mkWith (optDb != null) "system-db" null) + ]; + + buildPhase = optionalString libOnly '' + (cd util; make) + (cd include; make) + (cd lib; make) + (cd build-tools; make) + ''; + + installPhase = optionalString libOnly '' + mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}} + (cd util; make install) + (cd include; make install) + (cd lib; make install) + (cd build-tools; make install) + rm -rf $out/{bin,sbin,share} + ''; enableParallelBuilding = true; meta = with stdenv.lib; { + homepage = http://web.mit.edu/kerberos/; description = "MIT Kerberos 5"; - homepage = webpage; license = "MPL"; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; passthru.implementation = "krb5"; -}) +} diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index b135e49f52bb..eb795d6b28eb 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, krb5 }: +{ fetchurl, stdenv, libkrb5 }: stdenv.mkDerivation rec { name = "libtirpc-0.3.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna"; }; - propagatedBuildInputs = [ krb5 ]; + propagatedBuildInputs = [ libkrb5 ]; # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf preConfigure = '' diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 195e6bc43294..e8abe0ef0d0a 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages -, krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null +, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls + libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis ] ++ stdenv.lib.optional stdenv.isLinux systemd; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { (mkWith true "systemdsystemunitdir" "\${out}/etc/systemd/system") (mkEnable true "largefile" null) (mkEnable true "regexp" null) - (mkEnable (krb5 != null) "gssapi-krb5" null) + (mkEnable (libkrb5 != null) "gssapi-krb5" null) (mkEnable true "klog" null) (mkEnable true "kmsg" null) (mkEnable (systemd != null) "imjournal" null) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d9ac42ac3a7..4b82e3056511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6464,6 +6464,9 @@ let }; inherit (darwin) bootstrap_cmds; }; + libkrb5 = krb5.override { + prefix = "lib"; + }; LASzip = callPackage ../development/libraries/LASzip { }; From 7a9e0a5ae4ea51b3d5719f8d25f623ff1c3d3739 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 May 2015 02:19:46 -0700 Subject: [PATCH 054/127] util-linux: 2.26.1 -> 2.26.2 --- pkgs/os-specific/linux/util-linux/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 13749d7eaa15..7f2aeca255c8 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: stdenv.mkDerivation rec { - name = "util-linux-2.26.1"; + name = "util-linux-2.26.2"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v2.26/${name}.tar.xz"; - sha256 = "0vmvk5khfwf71xbsnplvmk9ikwnlbhysc96mnkgwpqk2faairp12"; + sha256 = "0rlnzmiqdannzf81fbh41541lrck63v9zhskm6h4i2jj8ahvsa8f"; }; - patches = [ ./rtcwake-search-PATH-for-shutdown.patch - ]; + patches = [ + ./rtcwake-search-PATH-for-shutdown.patch + ]; #FIXME: make it also work on non-nixos? postPatch = '' From fa89e79391bdb2e383df6017514028bed254d074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 28 May 2015 11:44:58 +0200 Subject: [PATCH 055/127] gnome3.anjuta: fix gsettings to be runnable at least --- pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix index 35315f67cad2..e488ab640472 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python }: + itstool, python, makeWrapper }: let major = gnome3.version; @@ -17,7 +17,13 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python ]; + gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/anjuta \ + --prefix XDG_DATA_DIRS : \ + "$GSETTINGS_SCHEMAS_PATH" + ''; meta = with stdenv.lib; { description = "Software development studio"; From 9f25762d29c0039cad81a139b5d79f6fc589509d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Thu, 28 May 2015 10:52:50 +0100 Subject: [PATCH 056/127] apache-kafka: Treat exit code 143 as success. JVMs exit with exit code 128+signal when receiving a (terminating) signal. This means graceful termination of a JVM will result in 143, so add that to `SuccessExitStatus` in systemd service unit. --- nixos/modules/services/misc/apache-kafka.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 168615153fed..90555ebc468b 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -143,6 +143,7 @@ in { ''; User = "apache-kafka"; PermissionsStartOnly = true; + SuccessExitStatus = "0 143"; }; preStart = '' mkdir -m 0700 -p ${concatStringsSep " " cfg.logDirs} From 026aa123a411d186614e3b7ce0092b2809394e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 28 May 2015 11:53:21 +0200 Subject: [PATCH 057/127] speexdsp: fix integer types not being included Description in comments of https://aur.archlinux.org/packages/retroshare/ I'm not sure why their conditionals don't work, but this fix should be safe. /cc maintainer @wkennington. --- pkgs/development/libraries/speexdsp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 1a9a6d486f36..7112afbea8a2 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "speexdsp-1.2rc3"; - + src = fetchurl { url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz"; sha256 = "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja"; }; patches = [ ./build-fix.patch ]; - + postPatch = "sed '3i#include ' -i ./include/speex/speexdsp_config_types.h.in"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ fftw ]; From adea54614d848c8a85e700885ec95a93402bd72b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 28 May 2015 13:10:47 +0200 Subject: [PATCH 058/127] fltk13, octave: expose fltk13 config and override in octave Octave needs fltk with libxft, see #8007. I'm not much familiar with composableDerivation, so perhaps this change could be done in a better way... --- pkgs/development/libraries/fltk/fltk13.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index df89482536f0..262ef8b865e1 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -1,6 +1,6 @@ { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng - +, cfg ? {} , automake, autoconf, libtool }: @@ -48,7 +48,7 @@ composableDerivation.composableDerivation {} { localpngSupport = false; sharedSupport = true; threadsSupport = true; - }; + } // cfg; meta = { description = "A C++ cross-platform light-weight GUI library binding"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b82e3056511..751e201cd82f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4782,7 +4782,7 @@ let }; octave = callPackage ../development/interpreters/octave { - fltk = fltk13; + fltk = fltk13.override { cfg.xftSupport = true; }; qt = null; ghostscript = null; llvm = null; @@ -4792,7 +4792,7 @@ let jdk = null; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { - fltk = fltk13; + fltk = fltk13.override { cfg.xftSupport = true; }; qt = qt4; })); From 6cc8869f383a242c4c995e9c158cc03d5b2c5170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 28 May 2015 13:14:37 +0200 Subject: [PATCH 059/127] fltk13: fix a bug preventing use in octave Fixes #8007 (together with the parent commit). --- pkgs/development/libraries/fltk/fltk13.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index 262ef8b865e1..a5b65f09e613 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -15,6 +15,12 @@ composableDerivation.composableDerivation {} { sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq"; }; + # http://www.fltk.org/str.php?L3156 + postPatch = '' + substituteInPlace FL/x.H \ + --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' + ''; + propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; enableParallelBilding = true; From ec8babb4fd754eb64d538b8a1a3020b970fe63d5 Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 28 May 2015 07:39:10 -0400 Subject: [PATCH 060/127] ffmpeg: include networking support add networking support to the default build, required by mpv --- pkgs/development/libraries/ffmpeg/generic.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 9a373c522786..13a339740f45 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm -, alsaLib, bzip2, fontconfig, freetype, libiconv, lame, libass, libogg, libtheora -, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr, x264 -, xvidcore, zlib +, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg +, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr +, x264, xvidcore, zlib , openglSupport ? false, mesa ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { else "--disable-pthreads --disable-w32threads") (ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2 + "--enable-network" (ifMinVer "2.4" "--enable-pixelutils") # Executables "--enable-ffmpeg" @@ -105,6 +106,7 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" "--disable-doc") # External Libraries "--enable-bzlib" + "--enable-gnutls" (ifMinVer "1.0" "--enable-fontconfig") (ifMinVer "0.7" "--enable-libfreetype") "--enable-libmp3lame" @@ -134,8 +136,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - bzip2 fontconfig freetype libiconv lame libass libogg libtheora libvdpau - libvorbis lzma SDL soxr x264 xvidcore zlib + bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora + libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib ] ++ optional openglSupport mesa ++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin ++ optional (isLinux || isFreeBSD) libva From 6a5126348bd29124f8d9846170edac5a463240d5 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 28 May 2015 13:49:17 +0200 Subject: [PATCH 061/127] rsyslog: krb5 -> libkrb5 argument changed few commits ago --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 751e201cd82f..8e80f64cfe07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -868,7 +868,7 @@ let }; rsyslog-light = callPackage ../tools/system/rsyslog { - krb5 = null; + libkrb5 = null; systemd = null; jemalloc = null; libmysql = null; From 831d597bfab70bf2952f9573b2cacc9d1c56de1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2015 01:23:55 +0200 Subject: [PATCH 062/127] perl-packages: Finance-Quote 1.35 -> 1.37 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e6556b0898ae..cbab34adc03b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3977,12 +3977,12 @@ let self = _self // overrides; _self = with self; { }; FinanceQuote = buildPerlPackage rec { - name = "Finance-Quote-1.35"; + name = "Finance-Quote-1.37"; src = fetchurl { url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; - sha256 = "0mxfhi1ndckj4w7fw20rwy6ymalg2yncnp9xn0v2bnk5ibqj439w"; + sha256 = "1b6pbh7f76fb5sa4f0lhx085xy55pprz5v7z7li7pqiyw7i4f4bf"; }; - propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ]; + propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc DateTime JSON ]; meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; From 633e73415207ad675af385c27ecbd75831c22c5c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 27 May 2015 09:54:19 +0200 Subject: [PATCH 063/127] cygwin: libiconvReal is used during bootstrapping phase on cygwin --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e80f64cfe07..1b8c86c5723c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6859,7 +6859,9 @@ let # standalone libiconv, just in case you want it libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal; - libiconvReal = callPackage ../development/libraries/libiconv { }; + libiconvReal = callPackage ../development/libraries/libiconv { + fetchurl = fetchurlBoot; + }; # On non-GNU systems we need GNU Gettext for libintl. libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext; From 52068e9b6eb6c2a1c74ea24ba404b948677de7e7 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 27 May 2015 15:10:41 +0200 Subject: [PATCH 064/127] cygwin: make perl LocaleGettext also build on cygwin --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cbab34adc03b..b61618c9449b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5184,8 +5184,8 @@ let self = _self // overrides; _self = with self; { LocaleGettext = buildPerlPackage { name = "LocaleGettext-1.05"; - buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.gettext; - NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lintl" else null; + buildInputs = stdenv.lib.optional (stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext; + NIX_CFLAGS_LINK = if (stdenv.isDarwin || stdenv.isCygwin) then "-lintl" else null; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; From c9a45f2f62bb3c7fc5e3f2374c26c91a478df8f7 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 27 May 2015 15:12:15 +0200 Subject: [PATCH 065/127] cygwin: make perl's XMLParser build on cygwin --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b61618c9449b..b185e741490c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10673,6 +10673,9 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz; sha256 = "1sadi505g5qmxr36lgcbrcrqh3a5gcdg32b405gnr8k54b6rg0dl"; }; + patchPhase = if stdenv.isCygwin then '' + sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm + '' else null; makeMakerFlags = "EXPATLIBPATH=${pkgs.expat}/lib EXPATINCPATH=${pkgs.expat}/include"; }; From 8bebcd5d40841baf7c8908606f6a6b46ae23605f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 27 May 2015 15:13:39 +0200 Subject: [PATCH 066/127] cygwin: patch boehm-gc on cygwin --- .../libraries/boehm-gc/cygwin.patch | 108 ++++++++++++++++++ .../libraries/boehm-gc/default.nix | 2 + 2 files changed, 110 insertions(+) create mode 100644 pkgs/development/libraries/boehm-gc/cygwin.patch diff --git a/pkgs/development/libraries/boehm-gc/cygwin.patch b/pkgs/development/libraries/boehm-gc/cygwin.patch new file mode 100644 index 000000000000..25c6b9f06f31 --- /dev/null +++ b/pkgs/development/libraries/boehm-gc/cygwin.patch @@ -0,0 +1,108 @@ +--- gc-7.2/include/gc.h 2014-06-01 19:00:48.000000000 +0200 ++++ gc-7.2/include/gc.h 2015-05-27 12:55:42.248984200 +0200 +@@ -1386,7 +1386,14 @@ + /* THREAD_LOCAL_ALLOC defined and the initial allocation call is not */ + /* to GC_malloc() or GC_malloc_atomic(). */ + +-#ifdef __CYGWIN32__ ++#ifdef __CYGWIN__ ++#ifdef __x86_64__ ++ extern int __data_start__[], __data_end__[], __bss_start__[], __bss_end__[]; ++#define GC_DATASTART (__data_start__ < __bss_start__ ?\ ++ (void *)__data_start__ : (void *)__bss_start__) ++#define GC_DATAEND (__data_end__ < __bss_end__ ?\ ++ (void *)__data_end__ : (void *)__bss_end__) ++#else + /* Similarly gnu-win32 DLLs need explicit initialization from the */ + /* main program, as does AIX. */ + extern int _data_start__[], _data_end__[], _bss_start__[], _bss_end__[]; +@@ -1394,6 +1401,7 @@ + (void *)_data_start__ : (void *)_bss_start__) + # define GC_DATAEND (_data_end__ > _bss_end__ ? \ + (void *)_data_end__ : (void *)_bss_end__) ++#endif + # define GC_INIT_CONF_ROOTS GC_add_roots(GC_DATASTART, GC_DATAEND); \ + GC_gcollect() /* For blacklisting. */ + /* Required at least if GC is in a DLL. And doesn't hurt. */ +--- gc-7.2/include/private/gcconfig.h 2014-06-01 19:00:48.000000000 +0200 ++++ gc-7.2/include/private/gcconfig.h 2015-05-27 12:46:01.864338700 +0200 +@@ -441,10 +441,20 @@ + # endif + # define mach_type_known + # endif +-# if defined(__CYGWIN32__) || defined(__CYGWIN__) ++# if defined(__CYGWIN32__) + # define I386 + # define CYGWIN32 + # define mach_type_known ++#if defined(__CYGWIN__) ++# if defined(__LP64__) ++# define X86_64 ++# define mach_type_known ++# else ++# define I386 ++# endif ++# define CYGWIN32 ++# define mach_type_known ++#endif + # endif + # if defined(__MINGW32__) && !defined(mach_type_known) + # define I386 +@@ -511,6 +521,16 @@ + # define mach_type_known + # endif + ++#if defined(__CYGWIN__) ++# if defined(__LP64__) ++# define X86_64 ++# define mach_type_known ++# else ++# define I386 ++# endif ++# define CYGWIN32 ++# define mach_type_known ++#endif + /* Feel free to add more clauses here */ + + /* Or manually define the machine type here. A machine type is */ +@@ -2279,6 +2299,20 @@ + # define GWW_VDB + # define DATAEND /* not needed */ + # endif ++ ++# ifdef CYGWIN32 ++# define OS_TYPE "CYGWIN32" ++# define DATASTART ((ptr_t)GC_DATASTART) /* From gc.h */ ++# define DATAEND ((ptr_t)GC_DATAEND) ++# define ALIGNMENT 8 ++# undef STACK_GRAN ++# define STACK_GRAN 0x10000 ++# ifdef USE_MMAP ++# define NEED_FIND_LIMIT ++# define USE_MMAP_ANON ++# endif ++# endif ++ + # endif /* X86_64 */ + + # ifdef HEXAGON +--- gc-7.2/os_dep.c 2015-05-27 12:25:29.097698800 +0200 ++++ gc-7.2/os_dep.c 2015-05-27 12:48:23.714600800 +0200 +@@ -764,10 +764,16 @@ + /* gcc version of boehm-gc). */ + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) + { ++# ifdef __x86_64__ ++ PNT_TIB pTib = NtCurrentTeb(); ++ void * _tlsbase = pTib->StackBase; ++ /*void * _tlsbase = NtCurrentTeb()->pTib.StackBase;*/ ++ /*extern void * _tlsbase __asm__ ("%gs:8");*/ ++# else + void * _tlsbase; +- + __asm__ ("movl %%fs:4, %0" + : "=r" (_tlsbase)); ++# endif + sb -> mem_base = _tlsbase; + return GC_SUCCESS; + } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index d71440a61d87..158f4b227dd3 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16"; }; + patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null; + configureFlags = [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config"; From 93d507cac874df274992c6038a07ca91994fc6d9 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 27 May 2015 15:16:53 +0200 Subject: [PATCH 067/127] cygwin: for 2.7.10 export-PyNode_SizeOf patch not needed anymore --- .../python/2.7/2.7.5-export-PyNode_SizeOf.patch | 13 ------------- .../development/interpreters/python/2.7/default.nix | 1 - 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch diff --git a/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch b/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch deleted file mode 100644 index e5efd6266902..000000000000 --- a/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch +++ /dev/null @@ -1,13 +0,0 @@ -For the parser extension - ---- origsrc/Include/node.h 2013-05-11 22:32:41.000000000 -0500 -+++ src/Include/node.h 2013-06-04 02:55:03.949347500 -0500 -@@ -21,7 +21,7 @@ PyAPI_FUNC(int) PyNode_AddChild(node *n, - char *str, int lineno, int col_offset); - PyAPI_FUNC(void) PyNode_Free(node *n); - #ifndef Py_LIMITED_API --Py_ssize_t _PyNode_SizeOf(node *n); -+PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n); - #endif - - /* Node access functions */ diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index eebd4514571e..e67c26829984 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -51,7 +51,6 @@ let ./2.7.3-dylib.patch ./2.7.3-getpath-exe-extension.patch ./2.7.3-no-libm.patch - ./2.7.5-export-PyNode_SizeOf.patch ]; preConfigure = '' From ea3748d5192d02e9f8856eacb21015248a9519ac Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 27 May 2015 15:20:32 +0200 Subject: [PATCH 068/127] cygwin: help2man patch for cygwin --- .../misc/help2man/1.40.4-cygwin-nls.patch | 165 ++++++++++++++++++ .../tools/misc/help2man/default.nix | 2 + 2 files changed, 167 insertions(+) create mode 100644 pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch diff --git a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch new file mode 100644 index 000000000000..20b99998154d --- /dev/null +++ b/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch @@ -0,0 +1,165 @@ +LD_PRELOAD by itself only works with Cygwin builtin functions, but +textdomain() and friends come from libintl. In order to override +those functions, we have to "replace" cygintl-?.dll since functions are +bound to a DLL name at link time. Our replacement will be used since +it is loaded first by LD_PRELOAD. + +But as we are making this *the* libintl, we need to provide +pass-throughs for the other functions which we're not overriding, +otherwise Locale::gettext won't load (not to mention the program +that we're trying to help2man). + +--- help2man-1.46.5/Makefile.in 2014-10-09 13:03:01.000000000 +0200 ++++ help2man-1.46.5/Makefile.in 2015-05-12 14:46:52.995521900 +0200 +@@ -76,7 +76,8 @@ + fi + + install_preload: install_dirs preload +- $(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir) ++ $(INSTALL_PROGRAM) lib/cygintl-8.dll $(DESTDIR)$(pkglibdir) ++ ln -sf cygintl-8.dll $(DESTDIR)$(pkglibdir)/$(preload).so + + install_l10n: install_dirs msg_l10n man_l10n info_l10n + set -e; \ +@@ -144,7 +146,9 @@ + + preload: $(preload).so + $(preload).so: $(srcdir)/$(preload).c +- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS) ++ mkdir -p lib ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-8.dll -shared $? $(LIBS) ++ ln -sf lib/cygintl-8.dll $@ + + man: $(target).1 + $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL +--- help2man-1.46.5/bindtextdomain.c 2009-11-13 00:01:34.000000000 -0600 ++++ help2man-1.46.5/bindtextdomain.c 2011-12-29 00:24:33.608078600 -0600 +@@ -27,12 +27,34 @@ static char *(*r_textdomain)(char const + static char *(*r_bindtextdomain)(char const *, char const *) = 0; + static char *(*r_bind_textdomain_codeset)(char const *, char const *) = 0; + ++#ifdef __CYGWIN__ ++static void *RTLD_NEXT = 0; ++static char *(*r_gettext)(const char *) = 0; ++static char *(*r_dgettext)(const char *, const char *) = 0; ++static char *(*r_dcgettext)(const char *, const char *, int) = 0; ++static char *(*r_ngettext)(const char *, const char *, unsigned long int) = 0; ++static char *(*r_dngettext)(const char *, const char *, const char *, ++ unsigned long int) = 0; ++static char *(*r_dcngettext)(const char *, const char *, const char *, ++ unsigned long int, int) = 0; ++static char *(*r_setlocale)(int, const char *) = 0; ++ ++#define SYM(sym) libintl_ ## sym ++#else ++#define SYM(sym) sym ++#endif ++ + void setup() + { + static int done = 0; + if (done++) + return; + ++#ifdef __CYGWIN__ ++ if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-8.dll", RTLD_LAZY))) ++ die("libintl8 not found"); ++#endif ++ + if (!(e_textdomain = getenv("TEXTDOMAIN"))) + die("TEXTDOMAIN not set"); + +@@ -48,9 +70,19 @@ void setup() + if (!(r_bind_textdomain_codeset = dlsym(RTLD_NEXT, + "bind_textdomain_codeset"))) + die("can't find symbol \"bind_textdomain_codeset\""); ++ ++#ifdef __CYGWIN__ ++ r_gettext = dlsym(RTLD_NEXT, "libintl_gettext"); ++ r_dgettext = dlsym(RTLD_NEXT, "libintl_dgettext"); ++ r_dcgettext = dlsym(RTLD_NEXT, "libintl_dcgettext"); ++ r_ngettext = dlsym(RTLD_NEXT, "libintl_ngettext"); ++ r_dngettext = dlsym(RTLD_NEXT, "libintl_dngettext"); ++ r_dcngettext = dlsym(RTLD_NEXT, "libintl_dcngettext"); ++ r_setlocale = dlsym(RTLD_NEXT, "libintl_setlocale"); ++#endif + } + +-char *textdomain(char const *domainname) ++char *SYM(textdomain)(char const *domainname) + { + char *r; + setup(); +@@ -61,7 +93,7 @@ char *textdomain(char const *domainname) + return r; + } + +-char *bindtextdomain(char const *domainname, char const *dirname) ++char *SYM(bindtextdomain)(char const *domainname, char const *dirname) + { + char const *dir = dirname; + setup(); +@@ -71,7 +103,7 @@ char *bindtextdomain(char const *domainn + return r_bindtextdomain(domainname, dir); + } + +-char *bind_textdomain_codeset(char const *domainname, char const *codeset) ++char *SYM(bind_textdomain_codeset)(char const *domainname, char const *codeset) + { + char *r; + setup(); +@@ -81,3 +113,54 @@ char *bind_textdomain_codeset(char const + + return r; + } ++ ++#ifdef __CYGWIN__ ++ ++char *libintl_gettext(const char *msgid) ++{ ++ setup(); ++ return r_gettext(msgid); ++} ++ ++char *libintl_dgettext (const char *domainname, const char *msgid) ++{ ++ setup(); ++ return r_dgettext(domainname, msgid); ++} ++ ++char *libintl_dcgettext (const char *domainname, const char *msgid, ++ int category) ++{ ++ setup(); ++ return r_dcgettext (domainname, msgid, category); ++} ++ ++char *libintl_ngettext (const char *msgid1, const char *msgid2, ++ unsigned long int n) ++{ ++ setup(); ++ return r_ngettext (msgid1, msgid2, n); ++} ++ ++char *libintl_dngettext (const char *domainname, const char *msgid1, ++ const char *msgid2, unsigned long int n) ++{ ++ setup(); ++ return r_dngettext (domainname, msgid1, msgid2, n); ++} ++ ++char *libintl_dcngettext (const char *domainname, ++ const char *msgid1, const char *msgid2, ++ unsigned long int n, int category) ++{ ++ setup(); ++ return r_dcngettext (domainname, msgid1, msgid2, n, category); ++} ++ ++char *libintl_setlocale (int i, const char *s) ++{ ++ setup(); ++ return r_setlocale (i, s); ++} ++ ++#endif diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 088e1574ebe1..f1b4f4f182e5 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { doCheck = false; # target `check' is missing + patches = if stdenv.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; + postInstall = '' wrapProgram "$out/bin/help2man" \ --prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)" From 08b5686cd768f6401c69915fa35a58e0f33dab0b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 27 May 2015 15:36:25 +0200 Subject: [PATCH 069/127] cygwin: tetex patch to make it build on cygwin --- pkgs/tools/typesetting/tex/tetex/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 79f768a086d8..24ab02e97d75 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed }: +{ stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed, automake }: stdenv.mkDerivation { name = "tetex-3.0"; @@ -20,6 +20,10 @@ stdenv.mkDerivation { sed -i 57d texk/kpathsea/c-std.h ''; + preConfigure = if stdenv.isCygwin then '' + find ./ -name "config.guess" -exec rm {} \; -exec ln -s ${automake}/share/automake-*/config.guess {} \; + '' else null; + patches = [ ./environment.patch ./getline.patch ./clang.patch ]; setupHook = ./setup-hook.sh; From ba9867fb5b423241cc8635d8374cf6e14c2aab34 Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 28 May 2015 09:30:36 -0400 Subject: [PATCH 070/127] mpv: refactor & fix youtube-dl support --- pkgs/applications/video/mpv/default.nix | 99 ++++++++++++++----------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 55 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 0e0c71bd9e1b..6bb7072a4a31 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,5 @@ -{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass -, lua, perl, libpthreadstubs -, lua5_sockets -, python3, docutils, which, lib +{ stdenv, fetchurl, docutils, makeWrapper, perl, pkgconfig, python, which +, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, lua, lua5_sockets , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null @@ -16,15 +14,19 @@ , theoraSupport ? true, libtheora ? null , jackaudioSupport ? true, jack2 ? null , pulseSupport ? true, pulseaudio ? null -, bs2bSupport ? false, libbs2b ? null +, bs2bSupport ? true, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null # for Youtube support -, youtubeSupport ? false, youtubeDL ? null -, cacaSupport ? false, libcaca ? null +, youtubeSupport ? true, youtube-dl ? null +, cacaSupport ? true, libcaca ? null , vaapiSupport ? false, libva ? null }: +# TODO: Wayland support +# TODO: investigate caca support +# TODO: investigate lua5_sockets bug + assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); @@ -41,22 +43,20 @@ assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; -assert youtubeSupport -> youtubeDL != null; +assert youtubeSupport -> youtube-dl != null; assert cacaSupport -> libcaca != null; -# Purity problem: Waf needed to be is downloaded by bootstrap.py -# but by purity reasons it should be avoided; thanks the-kenny to point it out! -# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour - let + inherit (stdenv.lib) optional optionals optionalString; + + # Purity: Waf is normally downloaded by bootstrap.py, but + # for purity reasons this behavior should be avoided. waf = fetchurl { url = http://ftp.waf.io/pub/release/waf-1.8.5; sha256 = "0gh266076pd9fzwkycskyd3kkv2kds9613blpxmn9w4glkiwmmh5"; }; - in -with stdenv.lib; stdenv.mkDerivation rec { name = "mpv-${version}"; version = "0.9.2"; @@ -66,9 +66,30 @@ stdenv.mkDerivation rec { sha256 = "0la7pmy75mq92kcrawdiw5idw6a46z7d15mlkgs0axyivdaqy560"; }; - buildInputs = - [ python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ] - ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] + patchPhase = '' + patchShebangs ./TOOLS/ + ''; + + NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext"; + + configureFlags = [ + "--enable-libmpv-shared" + "--disable-libmpv-static" + "--disable-static-build" + "--enable-manpage-build" + "--disable-build-date" # Purity + "--enable-zsh-comp" + ] ++ optional vaapiSupport "--enable-vaapi"; + + configurePhase = '' + python ${waf} configure --prefix=$out $configureFlags + ''; + + nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python which ]; + + buildInputs = [ + ffmpeg freetype libass libpthreadstubs lua lua5_sockets + ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora @@ -83,49 +104,39 @@ stdenv.mkDerivation rec { ++ optional speexSupport speex ++ optional bs2bSupport libbs2b ++ optional libpngSupport libpng - ++ optional youtubeSupport youtubeDL + ++ optional youtubeSupport youtube-dl ++ optional sdl2Support SDL2 ++ optional cacaSupport libcaca - ++ optional vaapiSupport libva - ; - -# There are almost no need of "configure flags", but some libraries -# weren't detected; see the TODO comments below - - NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + ++ optional vaapiSupport libva; enableParallelBuilding = true; - configurePhase = '' - python3 ${waf} configure --prefix=$out ${lib.optionalString vaapiSupport "--enable-vaapi"} - patchShebangs TOOLS - ''; - buildPhase = '' - python3 ${waf} build + python ${waf} build ''; installPhase = '' - python3 ${waf} install - # Maybe not needed, but it doesn't hurt anyway: a standard font + python ${waf} install + + # Use a standard font mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - ''; + '' + optionalString youtubeSupport '' + # Ensure youtube-dl is available in $PATH for MPV + wrapProgram $out/bin/mpv --prefix PATH : "${youtube-dl}/bin" + ''; + + meta = with stdenv.lib; { + description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; + homepage = http://mpv.io; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres fuuzetsu ]; + platforms = platforms.linux; - meta = with stdenv.lib;{ - description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)"; longDescription = '' mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. ''; - homepage = http://mpv.io; - license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ AndersonTorres fuuzetsu ]; - platforms = platforms.linux; }; } - -# TODO: Wayland support -# TODO: investigate caca support -# TODO: investigate lua5_sockets bug diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b82e3056511..7c47b1c2d27c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11806,8 +11806,6 @@ let youtubeSupport = config.mpv.youtubeSupport or true; cacaSupport = config.mpv.cacaSupport or true; vaapiSupport = config.mpv.vaapiSupport or false; - # YouTube needs network support and potentially openssl/tls - ffmpeg = if youtubeSupport then ffmpeg-full else ffmpeg; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; From 3fa15c820f7a0992e2b8940bf45f04b5b13d658a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 28 May 2015 16:13:47 +0000 Subject: [PATCH 071/127] doclifter: add new package --- .../tools/misc/doclifter/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/misc/doclifter/default.nix diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix new file mode 100644 index 000000000000..6c80e6faf5e9 --- /dev/null +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, python}: + +stdenv.mkDerivation { + name = "doclifter-2.15"; + src = fetchurl { + url = http://www.catb.org/~esr/doclifter/doclifter-2.15.tar.gz; + sha256 = "14k750bxp0kpnm130pp22vx3vmppfnzwisc042din1416ka07yv0"; + }; + buildInputs = [ python ]; + + makeFlags = "PREFIX=$(out)"; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + cp manlifter $out/bin + cp manlifter.1 $out/share/man/man1 + ''; + + meta = { + description = "Lift documents in nroff markups to XML-DocBook"; + homepage = http://www.catb.org/esr/doclifter; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a12d7549546..2026141a7c00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5280,6 +5280,8 @@ let binutils = binutils; }; + doclifter = callPackage ../development/tools/misc/doclifter { }; + docutils = pythonPackages.docutils; doxygen = callPackage ../development/tools/documentation/doxygen { From deec257852d8e41ecda6166f26adc926efecca90 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 28 May 2015 17:22:56 +0200 Subject: [PATCH 072/127] supertux: update from 0.1.3 to 0.3.5a --- pkgs/games/super-tux/default.nix | 42 ++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix index c8e0d3f097ff..11429cfadd2f 100644 --- a/pkgs/games/super-tux/default.nix +++ b/pkgs/games/super-tux/default.nix @@ -1,28 +1,34 @@ -{ fetchurl, stdenv, SDL, SDL_image, SDL_mixer, curl, gettext, libogg, libvorbis, mesa, openal }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer +, curl, gettext, libogg, libvorbis, mesa, openal, physfs, boost, glew +, libiconv }: -let - - version = "0.1.3"; - -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "supertux-${version}"; + version = "0.3.5a"; - src = fetchurl { - url = "mirror://sourceforge/supertux.berlios/supertux-${version}.tar.bz2"; - sha256 = "15xdq99jy4hayr96jpqcp15rbr9cs5iamjirafajcrkpa61mi4h0"; + src = fetchFromGitHub { + owner = "SuperTux"; + repo = "supertux"; + rev = "v${version}"; + sha256 = "0f522wsv0gx7v1h70x8xznklaqr5bm2l9h7ls9vjywy0z4iy1ahp"; }; - buildInputs = [ SDL SDL_image SDL_mixer curl gettext libogg libvorbis mesa openal ]; + buildInputs = [ pkgconfig cmake SDL2 SDL2_image SDL2_mixer curl gettext + libogg libvorbis mesa openal physfs boost glew libiconv ]; - patches = [ ./g++4.patch ]; + preConfigure = '' + patchShebangs configure + ''; - meta = { + postInstall = '' + mkdir $out/bin + ln -s $out/games/supertux2 $out/bin + ''; + + meta = with stdenv.lib; { description = "Classic 2D jump'n run sidescroller game"; - - homepage = http://supertux.lethargik.org/index.html; - - license = stdenv.lib.licenses.gpl2; + homepage = http://supertux.github.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; }; } From 8ac4521fee439637203c083d45f5f9768dbfc81e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 28 May 2015 18:40:33 +0200 Subject: [PATCH 073/127] mysql-workbench: fix references to /bin/bash and sudo Closes #5226 --- pkgs/applications/misc/mysql-workbench/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 4f2c2fba97c4..eddf9b8ac717 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -3,7 +3,7 @@ , libctemplate, libglade , libiodbc , libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql -, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite +, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo }: stdenv.mkDerivation rec { @@ -29,6 +29,16 @@ stdenv.mkDerivation rec { ''; postInstall = '' + patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh + + for i in $out/lib/mysql-workbench/modules/wb_utils_grt.py \ + $out/lib/mysql-workbench/modules/wb_server_management.py \ + $out/lib/mysql-workbench/modules/wb_admin_grt.py; do + substituteInPlace $i \ + --replace "/bin/bash" ${stdenv.shell} \ + --replace "/usr/bin/sudo" ${sudo}/bin/sudo + done + wrapProgram "$out/bin/mysql-workbench" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \ --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ From 1a3860e95a52a990043ca986e8f771fee6a090cb Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 28 May 2015 18:49:06 +0200 Subject: [PATCH 074/127] checkstyle: update from 6.5 to 6.6 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 4d47d5134371..f757d0e96199 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.5"; + version = "6.6"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; - sha256 = "1231rzmk7kzv77hpa0jj227152br9ahjdvxvzifk0mdfw0b34rdl"; + sha256 = "1pniql23f8fsr7yhcxvrc65rdynrwpwl6vxl2jdsj4a37br8mr0d"; }; installPhase = '' From b57097b2fee86b28aa9b53c40944a5bebf7f4e17 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 28 May 2015 18:54:35 +0200 Subject: [PATCH 075/127] fswatch: update from 1.4.6 to 1.4.7 --- .../tools/misc/fswatch/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 8f7f9437d4ef..487c57c54848 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub -, autoconf -, automake +, autoreconfHook , findutils # for xargs , gettext , libtool @@ -9,26 +8,18 @@ , texinfo }: -let - - version = "1.4.6"; - -in stdenv.mkDerivation { - +stdenv.mkDerivation rec { name = "fswatch-${version}"; + version = "1.4.7"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4"; + sha256 = "0f6aa14v31gy3j7qx563ml37r8mylpbqfjrz2v5g44zrrg6086w7"; }; - buildInputs = [ autoconf automake gettext libtool makeWrapper texinfo ]; - - preConfigure = '' - ./autogen.sh - ''; + buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ]; postFixup = '' for prog in fswatch-run fswatch-run-bash; do From 38bc63c60531ce37791b817223831e8a01c77d25 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 28 May 2015 18:56:12 +0200 Subject: [PATCH 076/127] help2man: update from 1.46.5 to 1.46.6 --- pkgs/development/tools/misc/help2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index f1b4f4f182e5..79dbb533d034 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.46.5"; + name = "help2man-1.46.6"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1gqfqgxq3qgwnldjz3i5mxvzyx2w3j042r3fw1wygic3f6327nha"; + sha256 = "1brccgnjf09f2zg70s6gv6gn68mi59kp3zf50wvxp79n72ngapv1"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; From f675c4d90db332d2b4c7f2f15918b3e5cdd1ce03 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 28 May 2015 18:57:32 +0200 Subject: [PATCH 077/127] icmake: update from 7.22.00 to 7.22.01 --- pkgs/development/tools/build-managers/icmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index a4e818649854..d83ae51aaaad 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "7.22.00"; + version = "7.22.01"; src = fetchurl { url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz"; - sha256 = "013vxnilygad981zb2608f95q2h3svvbgpjvzvk16qyxjy4y4q6z"; + sha256 = "1iv6p9cyvr9i2sjhklplr65llg1ycxqy7z4dfgn0nkwxgs9yf8mm"; }; preConfigure = '' From 3ae285976e61965eed43a889d9386f09b295fa5b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 28 May 2015 19:02:41 +0200 Subject: [PATCH 078/127] parallel: update from 20150322 to 20150522 --- pkgs/tools/misc/parallel/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 27d5e6245896..c78bf748296e 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20150322"; + name = "parallel-20150522"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1zsj1bd4zbwb4n9i0jgzs7vd5wkyg3xvj6s1q6s5fyn0pff7j01c"; + sha256 = "01pkckrad3d2i7mkw98zxymp22rsngyjknhh18i4m6hq82bijjjc"; }; patchPhase = @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shell tool for executing jobs in parallel"; - longDescription = '' GNU Parallel is a shell tool for executing jobs in parallel. A job is typically a single command or a small script that has to be run @@ -40,11 +39,8 @@ stdenv.mkDerivation rec { it possible to use output from GNU Parallel as input for other programs. ''; - homepage = http://www.gnu.org/software/parallel/; - license = licenses.gpl3Plus; - platforms = platforms.all; maintainers = with maintainers; [ pSub ]; }; From 8b3891226058116596fa00847ce5ed2b4dd2a9c4 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 28 May 2015 19:06:11 +0200 Subject: [PATCH 079/127] potrace: update from 1.11 to 1.12 --- pkgs/applications/graphics/potrace/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index f58fe0e28c1d..13636e1f1fe5 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchurl, zlib }: -let version = "1.11"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "potrace-${version}"; + version = "1.12"; src = fetchurl { - url = "http://potrace.sourceforge.net/download/potrace-${version}.tar.gz"; - sha256 = "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as"; + url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; + sha256 = "0fqpfq5wwqz8j6pfh4p2pbflf6r86s4h63r8jawzrsyvpbbz3fxh"; }; - configureFlags = ["--with-libpotrace"]; + configureFlags = [ "--with-libpotrace" ]; buildInputs = [ zlib ]; From 7822640a185771fb03e3aa8e5b27f03903df82aa Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 28 May 2015 19:10:52 +0200 Subject: [PATCH 080/127] yodl: update from 3.05.00 to 3.05.01 --- pkgs/development/tools/misc/yodl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index d6667b76759e..e58627857171 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "yodl-${version}"; - version = "3.05.00"; + version = "3.05.01"; buildInputs = [ perl icmake ]; src = fetchurl { url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz"; - sha256 = "12hv5ghrsk6kdi414glg888v3qk3m1nmicl8f0h5k4szm1i00dig"; + sha256 = "0ghdzr3lzgfzvfymnjbj4mw8vpq098swvipxghhqgfmv58dhwgas"; }; preConfigure = '' From 158e1cfdd0ddb8380e266dcf16a4167455335bc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2015 19:20:29 +0200 Subject: [PATCH 081/127] Don't use "with licenses;" for single licences And don't use square brackets on such lines. --- pkgs/applications/audio/fmit/default.nix | 2 +- .../audio/keyfinder-cli/default.nix | 2 +- pkgs/applications/audio/keyfinder/default.nix | 2 +- pkgs/applications/editors/atom/default.nix | 2 +- .../editors/emacs-modes/jabber/default.nix | 2 +- .../editors/emacs-modes/nyan-mode/default.nix | 2 +- .../editors/lighttable/default.nix | 2 +- .../applications/editors/vim/configurable.nix | 2 +- pkgs/applications/editors/vim/default.nix | 2 +- pkgs/applications/editors/vim/macvim.nix | 2 +- pkgs/applications/editors/vim/qvim.nix | 2 +- .../graphics/apitrace/default.nix | 2 +- .../graphics/simple-scan/default.nix | 2 +- .../graphics/zgrviewer/default.nix | 2 +- pkgs/applications/misc/eaglemode/default.nix | 2 +- pkgs/applications/misc/grass/default.nix | 2 +- pkgs/applications/misc/jekyll/default.nix | 2 +- .../feedreaders/rsstail/default.nix | 2 +- .../instant-messengers/baresip/default.nix | 2 +- .../networking/mailreaders/sup/default.nix | 2 +- .../networking/remote/x2goclient/default.nix | 2 +- .../networking/syncthing/default.nix | 2 +- .../science/logic/lci/default.nix | 2 +- .../science/logic/stp/default.nix | 2 +- .../science/math/pari/default.nix | 2 +- .../science/math/speedcrunch/default.nix | 2 +- .../molecular-dynamics/gromacs/default.nix | 2 +- .../version-management/src/default.nix | 2 +- pkgs/applications/video/clipgrab/default.nix | 2 +- pkgs/applications/video/dvdauthor/default.nix | 2 +- .../virtualization/remotebox/default.nix | 2 +- .../window-managers/awesome/default.nix | 2 +- .../window-managers/tabbed/default.nix | 2 +- .../window-managers/vwm/default.nix | 2 +- pkgs/data/documentation/zeal/default.nix | 2 +- pkgs/data/fonts/terminus-font/default.nix | 2 +- pkgs/data/misc/geolite-legacy/default.nix | 2 +- pkgs/data/misc/media-player-info/default.nix | 2 +- .../gnome-3/3.16/devtools/gdl/default.nix | 2 +- .../compilers/emscripten/default.nix | 2 +- .../interpreters/picoc/default.nix | 2 +- .../interpreters/ruby/ruby-1.9.3.nix | 2 +- pkgs/development/libraries/bobcat/default.nix | 2 +- .../libraries/boost-process/default.nix | 2 +- pkgs/development/libraries/git2/default.nix | 2 +- pkgs/development/libraries/hwloc/default.nix | 2 +- .../development/libraries/jsoncpp/default.nix | 2 +- .../libraries/kde-frameworks-5.10/default.nix | 2 +- pkgs/development/libraries/libcli/default.nix | 2 +- .../libraries/libkeyfinder/default.nix | 2 +- .../libraries/libpseudo/default.nix | 2 +- pkgs/development/libraries/libpsl/default.nix | 2 +- pkgs/development/libraries/libre/default.nix | 2 +- pkgs/development/libraries/librem/default.nix | 2 +- .../libraries/libtermkey/default.nix | 2 +- .../libraries/libviper/default.nix | 2 +- .../libraries/libvterm/default.nix | 2 +- .../libraries/libxcomp/default.nix | 2 +- .../development/libraries/qca-qt5/default.nix | 2 +- .../libraries/qmltermwidget/default.nix | 2 +- .../libraries/quesoglc/default.nix | 2 +- pkgs/development/libraries/rabbitmq-c/0.4.nix | 2 +- pkgs/development/libraries/re2/default.nix | 2 +- .../science/math/liblapack/3.5.0.nix | 2 +- .../science/math/liblapack/default.nix | 2 +- .../development/libraries/spandsp/default.nix | 2 +- .../libraries/unibilium/default.nix | 2 +- pkgs/development/tools/alloy/default.nix | 2 +- .../tools/analysis/coan/default.nix | 2 +- .../analysis/include-what-you-use/default.nix | 2 +- pkgs/development/tools/atom-shell/default.nix | 2 +- pkgs/development/tools/chefdk/default.nix | 2 +- pkgs/development/tools/java/cfr/default.nix | 2 +- .../development/tools/misc/ccache/default.nix | 2 +- .../tools/parsing/flexc++/default.nix | 2 +- .../tools/sauce-connect/default.nix | 2 +- pkgs/development/tools/thrust/default.nix | 2 +- pkgs/games/alienarena/default.nix | 2 +- pkgs/games/blobby/default.nix | 2 +- pkgs/games/eduke32/default.nix | 2 +- pkgs/games/gsb/default.nix | 2 +- pkgs/games/urbanterror/default.nix | 2 +- pkgs/games/vessel/default.nix | 2 +- pkgs/games/warsow/default.nix | 2 +- pkgs/games/worldofgoo/default.nix | 2 +- pkgs/games/xonotic/default.nix | 2 +- pkgs/misc/vim-plugins/default.nix | 2 +- pkgs/os-specific/linux/fatrace/default.nix | 2 +- pkgs/os-specific/linux/freefall/default.nix | 2 +- pkgs/os-specific/linux/ftop/default.nix | 2 +- pkgs/os-specific/linux/jfbview/default.nix | 2 +- pkgs/os-specific/linux/mcelog/default.nix | 2 +- pkgs/os-specific/linux/phc-intel/default.nix | 2 +- pkgs/os-specific/linux/sdparm/default.nix | 2 +- pkgs/servers/dico/default.nix | 2 +- pkgs/servers/monitoring/sensu/default.nix | 2 +- pkgs/servers/nosql/cassandra/2.0.nix | 2 +- pkgs/servers/nosql/cassandra/2.1.nix | 2 +- pkgs/servers/restund/default.nix | 2 +- pkgs/shells/mksh/default.nix | 2 +- pkgs/tools/admin/nxproxy/default.nix | 2 +- pkgs/tools/backup/bacula/default.nix | 2 +- pkgs/tools/compression/xdelta/default.nix | 2 +- pkgs/tools/filesystems/boxfs/default.nix | 2 +- pkgs/tools/filesystems/duff/default.nix | 2 +- pkgs/tools/filesystems/encfs/default.nix | 2 +- .../tools/filesystems/exfat-utils/default.nix | 2 +- pkgs/tools/filesystems/fuse-exfat/default.nix | 2 +- pkgs/tools/filesystems/mp3fs/default.nix | 2 +- pkgs/tools/filesystems/rdfind/default.nix | 2 +- pkgs/tools/filesystems/s3fs/default.nix | 2 +- pkgs/tools/misc/clex/default.nix | 2 +- pkgs/tools/misc/fluentd/default.nix | 2 +- pkgs/tools/misc/gparted/default.nix | 2 +- pkgs/tools/misc/qjoypad/default.nix | 2 +- pkgs/tools/misc/t/default.nix | 2 +- pkgs/tools/misc/tmuxinator/default.nix | 2 +- pkgs/tools/networking/darkstat/default.nix | 2 +- .../networking/dnscrypt-proxy/default.nix | 2 +- pkgs/tools/networking/hans/default.nix | 2 +- pkgs/tools/networking/ipv6calc/default.nix | 2 +- pkgs/tools/networking/isync/default.nix | 2 +- pkgs/tools/networking/maildrop/default.nix | 2 +- pkgs/tools/networking/netsniff-ng/default.nix | 2 +- .../networking/nss-pam-ldapd/default.nix | 2 +- pkgs/tools/networking/wicd/default.nix | 2 +- .../tools/package-management/dpkg/default.nix | 2 +- pkgs/tools/security/eid-mw/default.nix | 2 +- pkgs/tools/security/eid-viewer/default.nix | 2 +- pkgs/tools/system/bootchart/default.nix | 2 +- pkgs/tools/system/dog/default.nix | 2 +- pkgs/tools/system/foremost/default.nix | 2 +- pkgs/tools/system/stress-ng/default.nix | 2 +- pkgs/tools/system/suid-chroot/default.nix | 2 +- pkgs/tools/system/tm/default.nix | 2 +- pkgs/tools/system/ts/default.nix | 2 +- pkgs/tools/system/uptimed/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 24 +++++++-------- pkgs/top-level/python-packages.nix | 30 +++++++++---------- 139 files changed, 164 insertions(+), 164 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 0c12778089be..ead15e9a9187 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ALSA or JACK as sound input library. ''; homepage = http://home.gna.org/fmit/index.html; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index dca72f22b499..1f008e56c151 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { used to estimate the musical key of many different audio formats. ''; homepage = https://github.com/EvanPurkhiser/keyfinder-cli; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 33ce627e56ef..bea869ea3189 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { efficient workflow tool. ''; homepage = http://www.ibrahimshaath.co.uk/keyfinder/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index a3cdbb6afb96..31142efcc89a 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A hackable text editor for the 21st Century"; homepage = https://atom.io/; - license = [ licenses.mit ]; + license = licenses.mit; maintainers = [ maintainers.offline ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix index cb8a22a3c06f..781806bedd67 100644 --- a/pkgs/applications/editors/emacs-modes/jabber/default.nix +++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { a special case of text editing. ''; homepage = http://emacs-jabber.sourceforge.net/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix index a21c73b7e8b0..d57c591ec1e8 100644 --- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix @@ -26,6 +26,6 @@ trivialBuild rec { meta = with lib; { description = "An analog indicator of the position in the buffer"; homepage = https://github.com/TeMPOraL/nyan-mode/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index d4fa56898c36..6db7130896f5 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "the next generation code editor"; homepage = http://www.lighttable.com/; - license = [ licenses.gpl3 ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index b40e797f7ea4..ee3edaaf61b2 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -190,7 +190,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; - license = with licenses; [ vim ]; + license = licenses.vim; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index b13925fe14e6..7a1ce7aa1f24 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; - license = with licenses; [ vim ]; + license = licenses.vim; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 4519d4c26269..a63dd0ab9e28 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vim - the text editor - for Mac OS X"; homepage = https://github.com/b4winckler/macvim; - license = with licenses; [ vim ]; + license = licenses.vim; maintainers = with maintainers; [ cstrahan ]; platforms = platforms.darwin; }; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 42ed3daa6888..482e59833b35 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -118,7 +118,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor (Qt GUI fork)"; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; - license = with licenses; [ vim ]; + license = licenses.vim; maintainers = with maintainers; [ smironov ttuegel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index af499c51f973..348ba5c3c2c7 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://apitrace.github.io; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; - license = with licenses; mit; + license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index b47a8215fd46..43d717c58e59 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { interface is well tested. ''; homepage = https://launchpad.net/simple-scan; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index a6c299d1ab3a..724bddda6cf0 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # Quicker to unpack locally than load Hydra hydraPlatforms = []; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; description = "GraphViz graph viewer/navigator"; }; } diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 47535ab6b903..4324a33d2380 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; - license = with licenses; gpl3; + license = licenses.gpl3; maintainers = with maintainers; [ viric ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix index 9875b3abf013..823b6cdf5387 100644 --- a/pkgs/applications/misc/grass/default.nix +++ b/pkgs/applications/misc/grass/default.nix @@ -176,7 +176,7 @@ a.composableDerivation.composableDerivation {} (fix: { meta = { description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization"; homepage = http://grass.itc.it/index.php; - license = [ "GPL" ]; + license = "GPL"; broken = true; }; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index cc1d4e7c6592..5e9505e9f320 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -13,7 +13,7 @@ bundlerEnv { meta = with lib; { description = "Simple, blog aware, static site generator"; homepage = http://jekyllrb.com/; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index df5f79541822..ee9d1dbbf8d9 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { detects a new entry it'll emit only that new entry. ''; homepage = http://www.vanheusden.com/rsstail/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index db24670d9699..ec269def5b4e 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index 19715d7b255b..f7aff8a4d0c2 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -12,7 +12,7 @@ bundlerEnv { meta = with lib; { description = "A curses threads-with-tags style email client"; homepage = http://supmua.org; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ cstrahan lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 446b65c9882f..328a156260b0 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical NoMachine NX3 remote desktop client"; homepage = http://x2go.org/; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cea9329d9c82..0837659983e3 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = { homepage = http://syncthing.net/; description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; - license = with lib.licenses; mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matejc ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix index e2aff9313e95..d7f047b84e0f 100644 --- a/pkgs/applications/science/logic/lci/default.nix +++ b/pkgs/applications/science/logic/lci/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { description = ''Lambda calculus interpreter''; maintainers = with stdenv.lib.maintainers; [raskin]; platforms = with stdenv.lib.platforms; linux; - license = with stdenv.lib.licenses; gpl3; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index cfe96bc6983a..444bb06c4a00 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = ''Simple Theorem Prover''; maintainers = with stdenv.lib.maintainers; [mornfall]; platforms = with stdenv.lib.platforms; linux; - license = with stdenv.lib.licenses; mit; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index b97314f02d1d..9a3ab13c33e8 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; homepage = "http://pari.math.u-bordeaux.fr/"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index e2f34d48de27..66292499f2b4 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://speedcrunch.digitalfanatics.org"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; description = "A fast power user calculator"; longDescription = '' SpeedCrunch is a fast, high precision and powerful desktop calculator. diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bb851140b45d..43ef4337d573 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.gromacs.org"; - license = with licenses; gpl2; + license = licenses.gpl2; description = "Molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index ced82dd45c00..eede33c2145d 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://www.catb.org/~esr/src/; - license = [ stdenv.lib.licenses.bsd3 ]; + license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.shlevy ]; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 1256572de7ca..fd336dafb233 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { videos to MPEG4, MP3 or other formats in just one easy step. ''; homepage = http://clipgrab.org/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 03ccb2664fce..1711503314ec 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; - license = with licenses; gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index a257ef27e9fd..14adddf8d1b8 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VirtualBox client with remote management"; homepage = http://remotebox.knobgoblin.org.uk/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; longDescription = '' VirtualBox is traditionally considered to be a virtualization solution aimed at the desktop. While it is certainly possible to install diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index a158dd8dcf45..c57a89193b5e 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Highly configurable, dynamic window manager for X"; homepage = http://awesome.naquadah.org/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 82539b940b8c..4e6c9c9a83e6 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ viric ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index be0a946064b6..1e6b53446aa4 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://vwm.sourceforge.net/; description = "Dynamic window manager for the console"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ viric ]; platforms = with platforms; linux; }; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7bc1b9fa1fdd..515f172b7480 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { app), available for Linux and Windows. ''; homepage = "http://zealdocs.org/"; - license = with stdenv.lib.licenses; [ gpl3 ]; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 6dab322b056c..ad5fd1999eda 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { EGA/VGA-bold for 8x14 and 8x16. ''; homepage = http://www.is-vn.bg/hamster/; - license = with licenses; [ gpl2Plus ]; + license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; }; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index ef7511afb17f..69baf7bda453 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { inherit version; description = "GeoLite Legacy IP geolocation databases"; homepage = https://geolite.maxmind.com/download/geoip; - license = with licenses; cc-by-sa-30; + license = licenses.cc-by-sa-30; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index b2bfb7bd13dc..9abe5d6ea8e7 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -26,7 +26,7 @@ in meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainer = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix index 8e0c35eda308..e12f41c9b7f8 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { description = "Gnome docking library"; homepage = https://developer.gnome.org/gdl/; maintainers = [ maintainers.lethalman ]; - license = [ licenses.gpl2 ]; + license = licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index efe8be2051ff..b49884fad1c7 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/kripken/emscripten; description = "An LLVM-to-JavaScript Compiler"; maintainers = with maintainers; [ bosu ]; - license = with licenses; ncsa; + license = licenses.ncsa; }; } diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 8cad6dc369d9..c9ec01703bf0 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/zsaleeba/picoc; downloadPage = https://code.google.com/p/picoc/downloads/list; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix index 5f6540d3ee29..c53a012d7537 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - license = with licenses; [ ruby ]; + license = licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index d89a27638349..abd8a284e62f 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit version; description = "Brokken's Own Base Classes And Templates"; downloadPage = http://sourceforge.net/projects/bobcat/files/; - license = with licenses; gpl3; + license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 86cdd08db64c..92e02c6ca08f 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.highscore.de/boost/process0.5/"; description = "Library to manage system processes"; - license = with licenses; boost; + license = licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 7ddbc408ca6d..823f09b8bced 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "the Git linkable library"; homepage = http://libgit2.github.com/; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index da658e398eb1..c357d808cac4 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; # http://www.open-mpi.org/projects/hwloc/license.php - license = with licenses; bsd3; + license = licenses.bsd3; homepage = http://www.open-mpi.org/projects/hwloc/; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 07563364e340..c90a24816481 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/open-source-parsers/jsoncpp; description = "A simple API to manipulate JSON data in C++"; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - license = with stdenv.lib.licenses; [ mit ]; + license = stdenv.lib.licenses.mit; branch = "1.6"; }; } diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index 397eec61a781..4423f9c157d6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -113,7 +113,7 @@ let meta = let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in { - license = with stdenv.lib.licenses; [ bsd2 ]; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; homepage = "http://www.kde.org"; diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index dd0de49a4bdb..bbeb75d0b8dd 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = http://sites.dparrish.com/libcli; - license = with licenses; lgpl21Plus; + license = licenses.lgpl21Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 40efafdea3da..6ab80d55a455 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Musical key detection for digital audio (C++ library)"; homepage = http://www.ibrahimshaath.co.uk/keyfinder/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index 8a7054db20a0..8d1288f98ce5 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libpseudo.sourceforge.net/; description = "Simple, thread-safe messaging between threads"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index d642309ed746..4a2d7be7b8bb 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { the domain in a user interface or sorting domain lists by site. ''; homepage = http://rockdaboot.github.io/libpsl/; - license = with licenses; mit; + license = licenses.mit; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 56e7084292cd..0b9b79f0c605 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/re.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 165e16a88238..817e1c79bc7c 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/rem.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 4316b2dda6b9..e5965a10f67b 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal keypress reading library"; - license = with licenses; [ mit ]; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index 1dcd578da293..c0880ee896f6 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libviper.sourceforge.net/; description = "Simple window creation and management facilities for the console"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index b52db39042f0..e58d964a6253 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libvterm.sourceforge.net/; description = "Terminal emulator library to mimic both vt100 and rxvt"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index c900cfbc6841..84dbb0c156f4 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "NX compression library"; homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 37b0db4ef6ce..d0bcb73151f0 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Qt 5 Cryptographic Architecture"; homepage = http://delta.affinix.com/qca; maintainers = with maintainers; [ ttuegel ]; - license = with licenses; [ lgpl21Plus ]; + license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 32d9bd0a8e5f..9c657ec52d7f 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordifish90/qmltermwidget"; - license = with stdenv.lib.licenses; [ gpl2 ]; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 928095a4e29b..46df5459dca6 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { platform that supports both FreeType and the OpenGL API. ''; homepage = http://quesoglc.sourceforge.net/; - license = with licenses; [ lgpl21Plus ]; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; }; diff --git a/pkgs/development/libraries/rabbitmq-c/0.4.nix b/pkgs/development/libraries/rabbitmq-c/0.4.nix index 84a7a9b4ccf7..2c92ba5618cf 100644 --- a/pkgs/development/libraries/rabbitmq-c/0.4.nix +++ b/pkgs/development/libraries/rabbitmq-c/0.4.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "RabbitMQ C AMQP client library"; homepage = https://github.com/alanxz/rabbitmq-c; - license = with stdenv.lib.licenses; mit; + license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 301fcc84b9f2..b2dfa8884e9e 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/re2/; description = "An efficient, principled regular expression library"; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix index 3427bf1c4e98..35fca306d6c4 100644 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.simons ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index cbe03b8eb632..f2d64bbc9baf 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.simons ]; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 24dc443ca705..16e7b09a0f20 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; inherit version; updateWalker = true; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 11f3294b2894..663432f8ec86 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A very basic terminfo library"; - license = with licenses; [ lgpl3Plus ]; + license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 2c16f1f6f6cf..e0be56e50376 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://alloy.mit.edu/; downloadPage = http://alloy.mit.edu/alloy/download.html; - license = with licenses; mit; + license = licenses.mit; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index cd8cde1ae52e..ce9b8a9a59d6 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { application of this sort. ''; homepage = http://coan2.sourceforge.net/; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index c3381186aa8a..9a8df0f46901 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { replacing #includes with forward-declares when possible. ''; homepage = http://include-what-you-use.com; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/atom-shell/default.nix b/pkgs/development/tools/atom-shell/default.nix index 983c5c451d0a..4e5413b50122 100644 --- a/pkgs/development/tools/atom-shell/default.nix +++ b/pkgs/development/tools/atom-shell/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross platform desktop application shell"; homepage = https://github.com/atom/atom-shell; - license = [ licenses.mit ]; + license = licenses.mit; maintainers = [ maintainers.fluffynukeit ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index f8e759b83ee5..ee49423a8b17 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -13,7 +13,7 @@ bundlerEnv { meta = with lib; { description = "A streamlined development and deployment workflow for Chef platform"; homepage = https://downloads.chef.io/chef-dk/; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index a7be59a1fea1..f6cf63afc2a6 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { entirely in Java 6. ''; homepage = http://www.benf.org/other/cfr/; - license = with licenses; mit; + license = licenses.mit; platforms = with platforms; all; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index db02fef9f2a3..f7d2dfc4957c 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; downloadPage = https://ccache.samba.org/download.html; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; }; }; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 0d96c562c167..0a7e25305260 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; homepage = http://flexcpp.sourceforge.net/; downloadPage = http://sourceforge.net/projects/flexcpp/files/; - license = with licenses; gpl3; + license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 99e54e86a56e..948e39f4b550 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A secure tunneling app for executing tests securely when testing behind firewalls"; - license = with licenses; unfree; + license = licenses.unfree; homepage = https://docs.saucelabs.com/reference/sauce-connect/; maintainers = with maintainers; [offline]; platforms = with platforms; platforms.linux; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index 7f50b816cc19..a5bfb8bfc59f 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Chromium-based cross-platform / cross-language application framework"; homepage = https://github.com/breach/thrust; - license = [ licenses.mit ]; + license = licenses.mit; maintainers = [ maintainers.osener ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 485b52d3d088..a7d6bbc63d91 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://red.planetarena.org; # Engine is under GPLv2, everything else is under - license = with licenses; unfreeRedistributable; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 801b7ea72770..c577d65a559c 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = ''A blobby volleyball game''; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; homepage = "http://blobby.sourceforge.net/"; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index e7a420b894a1..46cd66d22af0 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Enhanched port of Duke Nukem 3D for various platforms"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; homepage = http://eduke32.com; maintainers = with maintainers; [ nckx sander ]; }; diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix index a0a25a2ff4b4..4c1a385baaf9 100644 --- a/pkgs/games/gsb/default.nix +++ b/pkgs/games/gsb/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { battle (or at least blow to bits in aesthetically pleasing ways). ''; homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html; - license = with licenses; unfree; + license = licenses.unfree; maintainers = with maintainers; [ jcumming ]; platforms = [ "x86_64-linux" "i686-linux" ] ; }; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 925362be1c58..9224d5872c22 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { realism". This results in a very unique, enjoyable and addictive game. ''; homepage = http://www.urbanterror.net; - license = with licenses; unfreeRedistributable; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 4a845a3a17e1..db389047ec77 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { to life, and all the consequences that ensue. ''; homepage = http://www.strangeloopgames.com; - license = with licenses; unfree; + license = licenses.unfree; maintainers = with maintainers; [ jcumming ]; }; diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 83c9b5d52fa5..95086d046303 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.warsow.net; # Engine is under GPLv2, everything else is under - license = with licenses; unfreeRedistributable; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; }; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 2382da034534..ba887d91de19 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { game, or that they are extremely delicious. ''; homepage = http://worldofgoo.com; - license = with licenses; unfree; + license = licenses.unfree; maintainers = with maintainers; [ jcumming ]; }; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index ba8245bb7006..7b68e1e3d365 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { aims to become the best possible open-source FPS of its kind. ''; homepage = http://www.xonotic.org; - license = with stdenv.lib.licenses; gpl2Plus; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 9b1c181c2a47..0ff38209867c 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -540,7 +540,7 @@ rec { meta = with stdenv.lib; { description = "Analytics about your programming"; homepage = https://wakatime.com; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 39c606f3fb54..b8fc6e5f6cee 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { inherit version; description = "Report system-wide file access events"; homepage = https://launchpad.net/fatrace/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; longDescription = '' fatrace reports file access events from all running processes. Its main purpose is to find processes which keep waking up the disk diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 7d5ed0cd3eee..4c1497367e32 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { the internal hard drive and park its heads on the ramp when critical situations are anticipated. This has no effect on SSD devices! ''; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 4733ce95bb27..e4165b08d7d9 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Show progress of open files and file systems"; homepage = https://code.google.com/p/ftop/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; longDescription = '' Ftop is to files what top is to processes. The progress of all open files and file systems can be monitored. If run as a regular user, the set of diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 7672318392f1..4b371097ee6e 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { - Customizable multi-threaded caching ''; homepage = http://seasonofcode.com/pages/jfbview.html; - license = with licenses; asl20; + license = licenses.asl20; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index a5f6242f84fd..16f1331d320b 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { inherit version; description = "Log machine checks (memory, IO, and CPU hardware errors)"; homepage = http://mcelog.org/; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index ac60501929a8..4b6569673861 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.linux-phc.org/; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 3b0f7c694ac0..fab13a125c42 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://sg.danny.cz/sg/sdparm.html; description = "A utility to access SCSI device parameters"; - license = with licenses; bsd3; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index ebabb1091eea..f898034719f3 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flexible dictionary server and client implementing RFC 2229"; homepage = http://www.gnu.org/software/dico/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index 38e59a39f381..2bb81d833372 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -11,7 +11,7 @@ meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; homepage = http://sensuapp.org/; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ theuni ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index adda65ce60a3..a0392d0f95ab 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = http://cassandra.apache.org/; description = "A massively scalable open source NoSQL database"; platforms = with platforms; all; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ nckx rushmorem ]; }; } diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 88a1d464b671..bbac243c7a02 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = http://cassandra.apache.org/; description = "A massively scalable open source NoSQL database"; platforms = with platforms; all; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ nckx rushmorem ]; }; } diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index 705a4ba43e7f..8a831f7ff697 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/restund.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index e951c24e6a04..28359bb555d0 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - license = with stdenv.lib.licenses; free; + license = stdenv.lib.licenses.free; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 2422d2bb4f7f..151cd68fdbcd 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "NX compression proxy"; homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index fdc52eabd4b5..0b29ca1f42ac 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Enterprise ready, Network Backup Tool"; homepage = http://bacula.org/; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ iElectric lovek323 ]; platforms = platforms.all; }; diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index fcc3b373fd10..5355138ac8c4 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { inherit version; description = "Binary differential compression in VCDIFF (RFC 3284) format"; homepage = http://xdelta.org/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index c0a6c8400fdd..f47107c85fb2 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation { unmount the file system with `fusermount -u mountpoint`. ''; homepage = https://github.com/drotiro/boxfs2; - license = with licenses; gpl3; + license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 409e7a8c36ff..59cb07dead0f 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quickly find duplicate files"; homepage = http://duff.dreda.org/; - license = with licenses; zlib; + license = licenses.zlib; longDescription = '' Duff is a Unix command-line utility for quickly finding duplicates in a given set of files. diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 81a3b46cacb7..211690606efe 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://vgough.github.io/encfs; description = "Provides an encrypted filesystem in user-space via FUSE"; - license = with licenses; lgpl2; + license = licenses.lgpl2; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix index a767ba36b3fa..3215b0d9174d 100644 --- a/pkgs/tools/filesystems/exfat-utils/default.nix +++ b/pkgs/tools/filesystems/exfat-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { Unix-like systems. ''; homepage = https://code.google.com/p/exfat; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix index 983228e9de51..ae9f9e32fa88 100644 --- a/pkgs/tools/filesystems/fuse-exfat/default.nix +++ b/pkgs/tools/filesystems/fuse-exfat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/exfat/; description = "A FUSE-based filesystem that allows read and write access to exFAT devices"; platforms = with platforms; linux; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 50242bb63882..23ee5558e146 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { simple drag-and-drop in a file browser. ''; homepage = http://khenriks.github.io/mp3fs/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 5106af489177..853654c0f790 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://rdfind.pauldreik.se/; description = "Removes or hardlinks duplicate files very swiftly"; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ wmertens ]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index f081f8121699..7e880ffeeb94 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mount an S3 bucket as filesystem through FUSE"; - license = with licenses; gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index 9c32d3c54667..47eacd9bdb09 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { add-on to your favorite shell. ''; homepage = http://www.clex.sk; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index cfc1e9ab5647..800e1c6f67a1 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -13,7 +13,7 @@ bundlerEnv { meta = with lib; { description = "A data collector"; homepage = http://www.fluentd.org/; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index e5c814faa4aa..dd2798de2729 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { while preserving the partition contents. ''; homepage = http://gparted.sourceforge.net; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index a3a34d95fb5b..663c60d28569 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { experience just a little bit nicer. ''; homepage = http://qjoypad.sourceforge.net; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index fd64f6694ee5..ad9e0949ce87 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -11,7 +11,7 @@ bundlerEnv { meta = with lib; { description = "A command-line power tool for Twitter"; homepage = http://sferik.github.io/t/; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 96610c321673..f5ac891d8e64 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -11,7 +11,7 @@ bundlerEnv { meta = with lib; { description = "Manage complex tmux sessions easily"; homepage = https://github.com/tmuxinator/tmuxinator; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ auntie ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index bc48bb6cf47e..ca0c5f5edf18 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { - Supports IPv6. ''; homepage = http://unix4lyfe.org/darkstat; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index bdd2c4a0c24e..11dadf9dcd87 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for securing communications between a client and a DNS resolver"; homepage = http://dnscrypt.org/; - license = with stdenv.lib.licenses; [ isc ]; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ joachifm ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index fcb3e9037536..c4f7c8da9d41 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { allowed. ''; homepage = http://code.gerade.org/hans/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 9b676c6b72e2..f1abec0faf71 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Now only one utiltity is needed to do a lot. ''; homepage = http://www.deepspace6.net/projects/ipv6calc.html; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index f16698ef3cd9..5d05677bb29a 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://isync.sourceforge.net/; description = "Free IMAP and MailDir mailbox synchronizer"; - license = with licenses; [ gpl2Plus ]; + license = licenses.gpl2Plus; maintainers = with maintainers; [ the-kenny viric ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index cf9c3a4fa4e0..fad99bbd7d7f 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.courier-mta.org/maildrop/; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; - license = with licenses; gpl3; + license = licenses.gpl3; }; } diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 967504a00047..c391bb9ecb0d 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { development and analysis, debugging, auditing or network reconnaissance. ''; homepage = http://netsniff-ng.org/; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 2368470b84d7..150f60f8de48 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; homepage = http://arthurdejong.org/nss-pam-ldapd/; - license = with licenses; [ lgpl21 ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 7f6addc86294..702948204252 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { connect at startup to any preferred network within range. ''; maintainers = [ maintainers.roconnor ]; - license = with licenses; gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 624386f34f27..beb0e7d8678c 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Debian package manager"; homepage = http://wiki.debian.org/Teams/Dpkg; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mornfall nckx ]; }; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index a8f6ae81e04c..ef15967330d7 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; - license = with licenses; lgpl3; + license = licenses.lgpl3; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. Also requires a running pcscd service and compatible card reader. diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix index 45a314e13a6f..06307263e52e 100644 --- a/pkgs/tools/security/eid-viewer/default.nix +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) viewer"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; - license = with licenses; lgpl3; + license = licenses.lgpl3; longDescription = '' A simple, graphical Java application to view, print and save data from Belgian electronic identity cards. Independent of the eid-mw package, diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 1e2f74e1b0a2..ef0a6d251a39 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.bootchart.org/; description = "Performance analysis and visualization of the GNU/Linux boot process"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index fd911142c219..ce29fc635531 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://lwn.net/Articles/421072/"; description = "cat replacement"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight ]; platforms = with platforms; all; }; diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index baaa97b4b243..d560fdad51bc 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { reliable and faster recovery. ''; homepage = http://foremost.sourceforge.net/; - license = with licenses; publicDomain; + license = licenses.publicDomain; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index a61835dbd0c8..e624991dc42a 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = http://kernel.ubuntu.com/~cking/stress-ng; downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index 62f7280a54ae..4aba9f48b764 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Setuid-safe wrapper for chroot"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index a1397cb6214f..c443dc148f13 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; description = "terminal mixer - multiplexer for the i/o of terminal applications"; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = with platforms; all; }; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 6cd69a746f0e..3bf4cea09f53 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; description = "task spooler - batch queue"; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = with platforms; all; }; diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index c9cf05373b58..386e80a13762 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { which can also easily be used to show your records on a web page. ''; homepage = https://github.com/rpodgorny/uptimed/; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cbab34adc03b..429da118b091 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -36,7 +36,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; homepage = http://betterthangrep.com/; - license = with licenses; artistic2; + license = licenses.artistic2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; @@ -607,7 +607,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the cairo 2d vector graphics library"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -3723,7 +3723,7 @@ let self = _self // overrides; _self = with self; { ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; meta = with stdenv.lib; { description = "Watch for changes to files, cross-platform style"; - license = with licenses; artistic2; + license = licenses.artistic2; }; }; @@ -3986,7 +3986,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; - license = with licenses; gpl2; + license = licenses.gpl2; }; }; @@ -4105,7 +4105,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl wrappers for the GLib utility and Object libraries"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl3Plus ]; + license = stdenv.lib.licenses.lgpl3Plus; }; }; @@ -4160,7 +4160,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { description = "Perl interface to the GraphViz graphing tool"; - license = with licenses; artistic2; + license = licenses.artistic2; maintainers = [ ]; }; }; @@ -4185,7 +4185,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -7273,7 +7273,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Layout and render international text"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -7813,7 +7813,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { homepage = http://user42.tuxfamily.org/podlinkcheck/index.html; description = "Check POD L<> link references"; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; }; }; @@ -7923,7 +7923,7 @@ let self = _self // overrides; _self = with self; { }; meta = with stdenv.lib; { description = "Provide commonly requested regular expressions"; - license = with licenses; mit; + license = licenses.mit; }; }; @@ -8435,7 +8435,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil SubExporter ]; meta = with stdenv.lib; { description = "Build sprintf-like functions of your own"; - license = with licenses; gpl2; + license = licenses.gpl2; }; }; @@ -9335,7 +9335,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionBase FatalException Moose namespaceclean TestAssert ]; meta = with stdenv.lib; { description = "Simulating other classes"; - license = with licenses; lgpl2Plus; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ ocharles ]; platforms = platforms.unix; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc6b79a86e4a..882ddad68152 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1766,7 +1766,7 @@ let A Python package for creating beautiful command line interfaces in a composable way, with as little code as necessary. ''; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -5412,7 +5412,7 @@ let It's just one file and is implemented using ctypes. ''; homepage = http://github.com/terencehonles/fusepy; - license = with licenses; isc; + license = licenses.isc; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; @@ -5513,7 +5513,7 @@ let - Allow for the same file at multiple paths. ''; homepage = https://github.com/dsoprea/GDriveFS; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; @@ -5664,7 +5664,7 @@ let anywhere within your gevent-powered application. ''; homepage = http://gehrcke.de/gipc; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ nckx ]; }; }; @@ -8058,7 +8058,7 @@ let not a large parsing framework or a component of some larger system. ''; - license = with licenses; bsd3; + license = licenses.bsd3; maintainers = [ ]; }; @@ -8432,7 +8432,7 @@ let syntax highlighting. ''; homepage = http://pgcli.com; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -8742,7 +8742,7 @@ let with a nice interactive Python shell (called ptpython) built on top. ''; homepage = https://github.com/jonathanslenders/python-prompt-toolkit; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -9047,7 +9047,7 @@ let meta = { homepage = https://pypi.python.org/pypi/pygit2; description = "A set of Python bindings to the libgit2 shared library"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; all; }; }; @@ -9489,7 +9489,7 @@ let meta = { homepage = http://pygments.org/; description = "A generic syntax highlighter"; - license = with licenses; [ bsd2 ]; + license = licenses.bsd2; maintainers = with maintainers; [ nckx ]; }; }; @@ -10190,7 +10190,7 @@ let meta = { homepage = "https://github.com/rackspace/pyrax"; - license = with licenses; mit; + license = licenses.mit; description = "Python API to interface with Rackspace"; }; @@ -10266,7 +10266,7 @@ let meta = { homepage = "http://github.com/mongodb/mongo-python-driver"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; description = "Python driver for MongoDB "; }; }; @@ -10334,7 +10334,7 @@ let in Python. ''; - license = with licenses; bsd3; + license = licenses.bsd3; maintainers = [ ]; }; @@ -10726,7 +10726,7 @@ let meta = { description = "Check the status of code repositories under a root directory"; homepage = https://github.com/kynikos/repocheck; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; }; }; @@ -12144,7 +12144,7 @@ let Provides support for parsing, splitting and formatting SQL statements. ''; homepage = https://github.com/andialbrecht/sqlparse; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -13182,7 +13182,7 @@ let no 3rd-party dependencies. ''; homepage = https://github.com/jquast/wcwidth; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ nckx ]; }; }; From 385936f7d946c553abc78b408786e064242c1e0f Mon Sep 17 00:00:00 2001 From: Sami BOUHLEL Date: Thu, 28 May 2015 20:53:57 +0100 Subject: [PATCH 082/127] added support for boto 2.38.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc6b79a86e4a..b95c90efab3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1294,11 +1294,11 @@ let boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.36.0"; + version = "2.38.0"; src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "1zrlmri89q2090yh9ylx798q4yk54y39v7w7xj101fnwc1r6jlqr"; + sha256 = "f2659f9b9d4f183a997ad0fc87f99f8cd3998df887fdadd3b776dada2b1df550"; }; checkPhase = '' From fb310a6998fa39162fba94ddd205177a3c59710d Mon Sep 17 00:00:00 2001 From: Sami BOUHLEL Date: Thu, 28 May 2015 21:15:16 +0100 Subject: [PATCH 083/127] added support for boto 2.38.0 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b95c90efab3f..542555fdebd6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1298,7 +1298,7 @@ let src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "f2659f9b9d4f183a997ad0fc87f99f8cd3998df887fdadd3b776dada2b1df550"; + sha256 = "0l7m3lmxmnknnz9svzc7z26rklwckzwqgz6hgackl62gkndryrgj"; }; checkPhase = '' From aa3dee3a2dc27b2ebc6e7a0ae4340f63d27ed102 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 May 2015 16:23:46 -0700 Subject: [PATCH 084/127] lightdm: Update to stable 1.14.2 --- pkgs/applications/display-managers/lightdm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 4b04a6e79090..943379890552 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,15 +4,15 @@ }: let - ver_branch = "1.15"; - version = "1.15.0"; + ver_branch = "1.14"; + version = "1.14.2"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0f0c2irb7qq49dabxhh99bwyvkxpfpscy4vynm7y800sz15lm2hs"; + sha256 = "18dvipdkp6hc1hysyiwpd5nwq6db3mg98rwi3am2ly3hk2bpic18"; }; patches = [ ./fix-paths.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://launchpad.net/lightdm; + homepage = https://launchpad.net/lightdm; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ocharles wkennington ]; From 0761f81da71fc6a940c7f51129b6c7717db78e87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2015 01:52:02 +0200 Subject: [PATCH 085/127] debian-devscripts -> 2.15.4 Temporarily drop bash completions until fixed. --- pkgs/tools/misc/debian-devscripts/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index a6e383df91a1..f8925d26beac 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -3,11 +3,11 @@ , perlPackages }: stdenv.mkDerivation rec { - version = "2.15.3"; + version = "2.15.4"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "f589e2e02c5e9a46a77b2516155631ac3ddfd8a39bcfc16c920862583850bc7d"; + sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile FileDesktopEntry libxslt python3 setuptools makeWrapper @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile* sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile* + + # Completion currently spams every shell startup with an error. Disable for now: + sed "/\/bash_completion\.d/d" -i scripts/Makefile ''; postInstall = '' sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/* From d9cc38757a4b1db60c0459e0759cdb085f0512dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 May 2015 09:52:29 +0200 Subject: [PATCH 086/127] openssl: add version 1.0.2a as attribute 'openssl_1_0_2' We'll try switching our default version after the 15.06 release has been branched off. Resolves https://github.com/NixOS/nixpkgs/issues/7970. --- .../development/libraries/openssl/1.0.2.x.nix | 114 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++ 2 files changed, 122 insertions(+) create mode 100644 pkgs/development/libraries/openssl/1.0.2.x.nix diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix new file mode 100644 index 000000000000..18c533ea1886 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.0.2.x.nix @@ -0,0 +1,114 @@ +{ stdenv, fetchurl, perl +, withCryptodev ? false, cryptodevHeaders }: + +let + name = "openssl-1.0.2a"; + + opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] + (throw "openssl needs its platform name cross building" null) + stdenv.cross; + + patchesCross = isCross: let + isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem"); + in + [ # Allow the location of the X509 certificate file (the CA + # bundle) to be set through the environment variable + # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the + # default location ($out/ssl/cert.pem) doesn't exist, and + # hardcoding something like /etc/ssl/cert.pem is impure and + # cannot be overriden per-process. For security, the + # environment variable is ignored for setuid binaries. + # FIXME: drop this patch; it really isn't necessary, because + # OpenSSL already supports a ‘SSL_CERT_FILE’ variable. + ./cert-file.patch + ] + + ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") + [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually + ./gnu.patch # submitted upstream + ] + + ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu") + [ ./gnu.patch + ./kfreebsd-gnu.patch + ] + + ++ stdenv.lib.optional isDarwin ./darwin-arch.patch; + + extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch; +in + +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + urls = [ + "http://www.openssl.org/source/${name}.tar.gz" + "http://openssl.linux-mirror.org/source/${name}.tar.gz" + ]; + sha256 = "0jijgzf72659pikms2bc5w31h78xrd1h5zp2r01an2h340y3kdhm"; + }; + + patches = (patchesCross false) ++ extraPatches; + + buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; + + nativeBuildInputs = [ perl ]; + + # 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.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; + + # CYGXXX: used to be set for cygwin with optionalString. Not needed + # anymore but kept to prevent rebuild. + preBuild = ""; + + 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)" ]; then + rm $out/lib/*.a + fi + ''; # */ + + crossAttrs = { + patches = patchesCross true; + + preConfigure='' + # It's configure does not like --build or --host + export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" + ''; + + postInstall = '' + # Openssl installs readonly files, which otherwise we can't strip. + # This could at some stdenv hash change be put out of crossAttrs, too + chmod -R +w $out + + # Remove references to perl, to avoid depending on it at runtime + rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget + ''; + configureScript = "./Configure"; + } // stdenv.lib.optionalAttrs (opensslCrossSystem == "darwin64-x86_64-cc") { + CC = "gcc"; + }; + + 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’ + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2026141a7c00..115afe2c3bb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7540,6 +7540,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; + }; + }; + ortp = callPackage ../development/libraries/ortp { }; p11_kit = callPackage ../development/libraries/p11-kit { }; From bd59bf9a74797d03174ad7301405eff75b3cda9b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 29 May 2015 09:46:37 +0200 Subject: [PATCH 087/127] cygwin: bash updated to 4.3 for cygwin platform --- pkgs/shells/bash/bash-4.1.17-9.src.patch | 987 ------------ .../bash/cygwin-bash-4.3.33-1.src.patch | 1393 +++++++++++++++++ pkgs/shells/bash/default.nix | 28 +- pkgs/top-level/all-packages.nix | 1 + 4 files changed, 1407 insertions(+), 1002 deletions(-) delete mode 100644 pkgs/shells/bash/bash-4.1.17-9.src.patch create mode 100644 pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch diff --git a/pkgs/shells/bash/bash-4.1.17-9.src.patch b/pkgs/shells/bash/bash-4.1.17-9.src.patch deleted file mode 100644 index f236946483c2..000000000000 --- a/pkgs/shells/bash/bash-4.1.17-9.src.patch +++ /dev/null @@ -1,987 +0,0 @@ ---- Makefile.in 2009-12-30 10:05:40.000000000 -0800 -+++ Makefile.in 2014-10-08 13:50:27.419837900 -0700 -@@ -565,7 +565,7 @@ lint: - ${MAKE} ${MFLAGS} CFLAGS='${GCC_LINT_FLAGS}' .made - - version.h: $(SOURCES) config.h Makefile -- $(SHELL) $(SUPPORT_SRC)mkversion.sh -b -S ${topdir} -s $(RELSTATUS) -d $(Version) -o newversion.h \ -+ $(SHELL) $(SUPPORT_SRC)mkversion.sh -S ${topdir} -s $(RELSTATUS) -d $(Version) -o newversion.h \ - && mv newversion.h version.h - - bashversion$(EXEEXT): patchlevel.h conftypes.h version.h buildversion.o $(SUPPORT_SRC)bashversion.c ---- bashline.c 2014-10-08 13:45:09.240173500 -0700 -+++ bashline.c 2014-10-08 13:50:27.419837900 -0700 -@@ -68,6 +68,12 @@ - # include "pcomplete.h" - #endif - -+#ifdef __x86_64__ -+#define IMP(x) __imp_##x -+#else -+#define IMP(x) _imp__##x -+#endif -+ - /* These should agree with the defines for emacs_mode and vi_mode in - rldefs.h, even though that's not a public readline header file. */ - #ifndef EMACS_EDITING_MODE -@@ -239,6 +245,11 @@ int no_empty_command_completion; - are the only possible matches, even if FIGNORE says to. */ - int force_fignore = 1; - -+#if __CYGWIN__ -+/* If set, shorten "foo.exe" to "foo" when they are the same file. */ -+int completion_strip_exe; -+#endif /* __CYGWIN__ */ -+ - /* Perform spelling correction on directory names during word completion */ - int dircomplete_spelling = 0; - -@@ -446,11 +457,12 @@ initialize_readline () - kseq[0] = CTRL('J'); - kseq[1] = '\0'; - func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); -- if (func == rl_vi_editing_mode) -+ extern rl_command_func_t *IMP(rl_vi_editing_mode); -+ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) - rl_unbind_key_in_map (CTRL('J'), emacs_meta_keymap); - kseq[0] = CTRL('M'); - func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); -- if (func == rl_vi_editing_mode) -+ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) - rl_unbind_key_in_map (CTRL('M'), emacs_meta_keymap); - #if defined (VI_MODE) - rl_unbind_key_in_map (CTRL('E'), vi_movement_keymap); -@@ -469,7 +481,8 @@ initialize_readline () - kseq[0] = '~'; - kseq[1] = '\0'; - func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); -- if (func == 0 || func == rl_tilde_expand) -+ extern rl_command_func_t *IMP(rl_tilde_expand); -+ if (func == 0 || func == rl_tilde_expand || func == IMP(rl_tilde_expand)) - rl_bind_keyseq_in_map (kseq, bash_complete_username, emacs_meta_keymap); - - rl_bind_key_if_unbound_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap); -@@ -492,7 +505,8 @@ initialize_readline () - kseq[0] = TAB; - kseq[1] = '\0'; - func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); -- if (func == 0 || func == rl_tab_insert) -+ extern rl_command_func_t *IMP(rl_tab_insert); -+ if (func == 0 || func == rl_tab_insert || func == IMP(rl_tab_insert)) - rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap); - - /* Tell the completer that we want a crack first. */ -@@ -1826,6 +1840,14 @@ globword: - /* If we have found a match, and it is an executable file or a - directory name, return it. */ - if (match && executable_or_directory (val)) -+#elif __CYGWIN__ -+ /* executable_or_directory will do the right thing on //server, -+ but calling stat("//server") is an order of magnitude slower -+ than noting that readdir("//") only returns directories. */ -+ if (match && (searching_path ? executable_file (val) -+ : ((val[0] == '/' && val[1] == '/' -+ && ! strchr (&val[2], '/')) -+ || executable_or_directory (val)))) - #else - /* If we have found a match, and it is an executable file, return it. - We don't return directory names when searching $PATH, since the -@@ -1835,6 +1857,21 @@ globword: - if (match && (searching_path ? executable_file (val) : executable_or_directory (val))) - #endif - { -+#if __CYGWIN__ -+ if (completion_strip_exe) -+ { -+ int val_len = strlen (val); -+ char *candidate; -+ if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe") -+ && (candidate = strdup (val))) -+ { -+ candidate[val_len - 4] = '\0'; -+ if (same_file (val, candidate, NULL, NULL)) -+ temp[strlen (temp) - 4] = '\0'; -+ free (candidate); -+ } -+ } -+#endif - free (val); - val = ""; /* So it won't be NULL. */ - return (temp); -@@ -2566,6 +2603,17 @@ test_for_directory (name) - int r; - - fn = bash_tilde_expand (name, 0); -+#if __CYGWIN__ -+ /* stat("//server") can only be successful as a directory, but takes -+ a several-second timeout to fail. It is much faster to assume -+ that //server is a valid name than it is to wait for the stat, -+ even though it gives false positives on bad names. */ -+ if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/')) -+ { -+ free (fn); -+ return 1; -+ } -+#endif /* __CYGWIN__ */ - r = file_isdir (fn); - free (fn); - ---- builtins/evalfile.c 2009-10-19 14:38:21.000000000 -0700 -+++ builtins/evalfile.c 2014-10-08 13:50:27.419837900 -0700 -@@ -148,10 +148,6 @@ file_error_and_exit: - return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1); - } - --#if defined (__CYGWIN__) && defined (O_TEXT) -- setmode (fd, O_TEXT); --#endif -- - if (S_ISREG (finfo.st_mode) && file_size <= SSIZE_MAX) - { - string = (char *)xmalloc (1 + file_size); ---- builtins/set.def 2009-01-04 11:32:23.000000000 -0800 -+++ builtins/set.def 2014-10-08 13:50:27.419837900 -0700 -@@ -56,6 +56,13 @@ extern int dont_save_function_defs; - #if defined (READLINE) - extern int no_line_editing; - #endif /* READLINE */ -+#if __CYGWIN__ -+extern int igncr; -+static int set_minus_o_option_maybe (int, const char *, int); -+# define INTERACTIVE_ONLY ,1 -+#else /* ! __CYGWIN__ */ -+# define INTERACTIVE_ONLY -+#endif - - $BUILTIN set - $FUNCTION set_builtin -@@ -92,6 +99,9 @@ Options: - #if defined (HISTORY) - history enable command history - #endif -+#if __CYGWIN__ -+ igncr on cygwin, ignore \r in line endings -+#endif - ignoreeof the shell will not exit upon reading EOF - interactive-comments - allow comments to appear in interactive commands -@@ -181,28 +191,40 @@ const struct { - int *variable; - setopt_set_func_t *set_func; - setopt_get_func_t *get_func; -+#if __CYGWIN__ -+ /* Cygwin users have taken to exporting SHELLOPTS for the -+ cygwin-specific igncr. As a result, we need to make sure -+ SHELLOPTS parsing does not turn on interactive options when -+ exported from an interactive shell, but parsed in a -+ non-interactive setting, since some interactive options violate -+ POSIX /bin/sh rules. */ -+ int interactive_only; -+#endif /* __CYGWIN__ */ - } o_options[] = { - { "allexport", 'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - #if defined (BRACE_EXPANSION) - { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - #endif - #if defined (READLINE) -- { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, -+ { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, - #endif - { "errexit", 'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "errtrace", 'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "functrace", 'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "hashall", 'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - #if defined (BANG_HISTORY) -- { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, -+ { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, - #endif /* BANG_HISTORY */ - #if defined (HISTORY) -- { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL }, -+ { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, -+#endif -+#if __CYGWIN__ -+ { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL }, - #endif - { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL }, - { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "keyword", 'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, -- { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, -+ { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, - { "noclobber", 'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "noexec", 'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "noglob", 'f', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, -@@ -220,7 +242,7 @@ const struct { - { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "verbose", 'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - #if defined (READLINE) -- { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, -+ { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, - #endif - { "xtrace", 'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, -@@ -407,6 +429,15 @@ int - set_minus_o_option (on_or_off, option_name) - int on_or_off; - char *option_name; -+#if __CYGWIN__ -+{ -+ /* See cygwin comments above. */ -+ return set_minus_o_option_maybe (on_or_off, option_name, 0); -+} -+static int -+set_minus_o_option_maybe (int on_or_off, const char *option_name, -+ int avoid_interactive) -+#endif /* __CYGWIN__ */ - { - register int i; - -@@ -414,6 +445,10 @@ set_minus_o_option (on_or_off, option_na - { - if (STREQ (option_name, o_options[i].name)) - { -+#if __CYGWIN__ -+ if (o_options[i].interactive_only && avoid_interactive) -+ return EXECUTION_SUCCESS; -+#endif /* __CYGWIN__ */ - if (o_options[i].letter == 0) - { - SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name); -@@ -539,7 +574,11 @@ parse_shellopts (value) - vptr = 0; - while (vname = extract_colon_unit (value, &vptr)) - { -+#if __CYGWIN__ -+ set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell); -+#else /* !__CYGWIN__ */ - set_minus_o_option (FLAG_ON, vname); -+#endif - free (vname); - } - } ---- builtins/shopt.def 2009-12-22 13:25:32.000000000 -0800 -+++ builtins/shopt.def 2014-10-08 13:50:27.435414600 -0700 -@@ -85,6 +85,10 @@ extern int check_jobs_at_exit; - extern int autocd; - extern int glob_star; - -+#if defined(__CYGWIN__) && defined(READLINE) -+extern int completion_strip_exe; -+#endif -+ - #if defined (EXTENDED_GLOB) - extern int extended_glob; - #endif -@@ -146,6 +150,9 @@ static struct { - { "compat31", &shopt_compat31, set_compatibility_level }, - { "compat32", &shopt_compat32, set_compatibility_level }, - { "compat40", &shopt_compat40, set_compatibility_level }, -+#if defined(__CYGWIN__) && defined(READLINE) -+ { "completion_strip_exe", &completion_strip_exe, NULL }, -+#endif - #if defined (READLINE) - { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL }, - #endif ---- config-top.h 2009-12-22 12:29:39.000000000 -0800 -+++ config-top.h 2014-10-08 13:50:27.435414600 -0700 -@@ -75,10 +75,10 @@ - #define KSH_COMPATIBLE_SELECT - - /* System-wide .bashrc file for interactive shells. */ --/* #define SYS_BASHRC "/etc/bash.bashrc" */ -+//set by nix #define SYS_BASHRC "/etc/bash.bashrc" - - /* System-wide .bash_logout for login shells. */ --/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ -+//set by nix #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" - - /* Define this to make non-interactive shells begun with argv[0][0] == '-' - run the startup files when not in posix mode. */ -@@ -88,7 +88,7 @@ - sshd and source the .bashrc if so (like the rshd behavior). This checks - for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment, - which can be fooled under certain not-uncommon circumstances. */ --/* #define SSH_SOURCE_BASHRC */ -+//set by nix #define SSH_SOURCE_BASHRC - - /* Define if you want the case-capitalizing operators (~[~]) and the - `capcase' variable attribute (declare -c). */ ---- doc/Makefile.in 2009-03-10 08:44:30.000000000 -0700 -+++ doc/Makefile.in 2014-10-08 13:50:27.435414600 -0700 -@@ -170,7 +170,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER) - $(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi - - bash.info: bashref.info -- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \ -+ ${SHELL} ${INFOPOST} < bashref.info > $@ ; \ - - bash.txt: bash.1 - bash.ps: bash.1 -@@ -226,9 +226,9 @@ install: info installdirs bash.info - -$(INSTALL_DATA) $(srcdir)/bash.1 $(DESTDIR)$(man1dir)/bash${man1ext} - -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext} - # uncomment the next lines to install the builtins man page --# sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 --# -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} --# -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 -+ sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 -+ -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} -+ -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 - -if test -f bash.info; then d=.; else d=$(srcdir); fi; \ - $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info - # run install-info if it is present to update the info directory ---- doc/bash.1 2009-12-30 10:01:31.000000000 -0800 -+++ doc/bash.1 2014-10-08 13:50:27.435414600 -0700 -@@ -1568,6 +1568,14 @@ subsequently reset. - Expands to the effective user ID of the current user, initialized at - shell startup. This variable is readonly. - .TP -+.B EXECIGNORE -+A colon-separated list of extended glob (see \fBPattern Matching\fP) -+patterns. Files with full paths matching one of these patterns are -+not considered executable for the purposes of completion and PATH -+searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not -+affected. Use this variable to deal with systems that set the -+executable bit on files that are not actually executable. -+.TP - .B FUNCNAME - An array variable containing the names of all shell functions - currently in the execution call stack. -@@ -8772,6 +8780,10 @@ If set, - attempts spelling correction on directory names during word completion - if the directory name initially supplied does not exist. - .TP 8 -+.B completion_strip_exe -+If set, whenever bash sees `foo.exe' during completion, it checks if -+`foo' is the same file and strips the suffix. -+.TP 8 - .B dotglob - If set, - .B bash ---- doc/bashref.texi 2009-12-29 12:59:18.000000000 -0800 -+++ doc/bashref.texi 2014-10-08 13:50:27.435414600 -0700 -@@ -4363,6 +4363,10 @@ If set, Bash - changes its behavior to that of version 3.1 with respect to quoted - arguments to the conditional command's =~ operator. - -+@item completion_strip_exe -+If set, whenever bash sees `foo.exe' during completion, it checks if -+`foo' is the same file and strips the suffix. -+ - @item dirspell - If set, Bash - attempts spelling correction on directory names during word completion -@@ -4892,6 +4896,14 @@ emacs shell buffer and disables line edi - The numeric effective user id of the current user. This variable - is readonly. - -+@item EXECIGNORE -+A colon-separated list of extended glob ((@pxref{Pattern Matching}) -+patterns. Files with full paths matching one of these patterns are -+not considered executable for the purposes of completion and PATH -+searching, but the @code{[}, @code{[[}, and @code{test} builtins are -+not affected. Use this variable to deal with systems that set the -+executable bit on files that are not actually executable. -+ - @item FCEDIT - The editor used as a default by the @option{-e} option to the @code{fc} - builtin command. ---- doc/builtins.1 2008-08-12 06:24:40.000000000 -0700 -+++ doc/builtins.1 2014-10-08 13:50:27.435414600 -0700 -@@ -12,6 +12,6 @@ shift, shopt, source, suspend, test, tim - ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1) - .SH BASH BUILTIN COMMANDS - .nr zZ 1 --.so bash.1 -+.so man1/bash.1 - .SH SEE ALSO - bash(1), sh(1) ---- execute_cmd.c 2009-12-30 09:55:37.000000000 -0800 -+++ execute_cmd.c 2014-10-08 13:50:27.435414600 -0700 -@@ -4004,7 +4004,7 @@ execute_function (var, words, flags, fds - char *debug_trap, *error_trap, *return_trap; - #if defined (ARRAY_VARS) - SHELL_VAR *funcname_v, *nfv, *bash_source_v, *bash_lineno_v; -- ARRAY *funcname_a, *bash_source_a, *bash_lineno_a; -+ ARRAY *funcname_a, *volatile bash_source_a, *volatile bash_lineno_a; - #endif - FUNCTION_DEF *shell_fn; - char *sfile, *t; -@@ -4571,6 +4571,12 @@ execute_disk_command (words, redirects, - hookf = find_function (NOTFOUND_HOOK); - if (hookf == 0) - { -+#if __CYGWIN__ -+ /* Point out \r use to clueless users. The memory leak -+ is harmless - we're about to exit. */ -+ if (ansic_shouldquote (pathname)) -+ pathname = ansic_quote (pathname, 0, NULL); -+#endif /* __CYGWIN__ */ - internal_error (_("%s: command not found"), pathname); - exit (EX_NOTFOUND); /* Posix.2 says the exit status is 127 */ - } -@@ -4990,6 +4996,10 @@ do_piping (pipe_in, pipe_out) - dup_error (pipe_in, 0); - if (pipe_in > 0) - close (pipe_in); -+#if __CYGWIN__ -+ /* Let stdio know that fd may have changed from text to binary. */ -+ freopen (NULL, "r", stdin); -+#endif /* __CYGWIN__ */ - } - if (pipe_out != NO_PIPE) - { -@@ -5005,5 +5015,12 @@ do_piping (pipe_in, pipe_out) - if (dup2 (1, 2) < 0) - dup_error (1, 2); - } -+#if __CYGWIN__ -+ extern int sh_setlinebuf (FILE *); -+ /* Let stdio know that fd may have changed from text to binary. */ -+ freopen (NULL, "w", stdout); -+ /* Bash builtins (foolishly) rely on line-buffering. */ -+ sh_setlinebuf (stdout); -+#endif /* __CYGWIN__ */ - } - } ---- findcmd.c 2009-06-05 13:25:38.000000000 -0700 -+++ findcmd.c 2014-10-08 13:50:27.451015900 -0700 -@@ -43,6 +43,8 @@ - #include "hashcmd.h" - #include "findcmd.h" /* matching prototypes and declarations */ - -+#include -+ - extern int posixly_correct; - - /* Static functions defined and used in this file. */ -@@ -71,6 +73,38 @@ int check_hashed_filenames; - containing the file of interest. */ - int dot_found_in_search = 0; - -+static struct ignorevar execignore = -+{ -+ "EXECIGNORE", -+ (struct ign *)0, -+ 0, -+ (char *)0, -+ (sh_iv_item_func_t *)0, -+}; -+ -+void -+setup_exec_ignore (char *varname) -+{ -+ setup_ignore_patterns (&execignore); -+} -+ -+/* Return whether we should never consider file executable -+ * even if the system tells us it is. */ -+static int -+is_on_exec_blacklist (char *name) -+{ -+ struct ign *p; -+ int flags = FNM_EXTMATCH | FNM_CASEFOLD; -+ -+ for (p = execignore.ignores; p && p->val; p++) -+ { -+ if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH) -+ return (1); -+ } -+ -+ return (0); -+} -+ - /* Return some flags based on information about this file. - The EXISTS bit is non-zero if the file is found. - The EXECABLE bit is non-zero the file is executble. -@@ -98,7 +132,7 @@ file_status (name) - file access mechanisms into account. eaccess uses the effective - user and group IDs, not the real ones. We could use sh_eaccess, - but we don't want any special treatment for /dev/fd. */ -- if (eaccess (name, X_OK) == 0) -+ if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0) - r |= FS_EXECABLE; - if (eaccess (name, R_OK) == 0) - r |= FS_READABLE; ---- findcmd.h 2009-01-04 11:32:29.000000000 -0800 -+++ findcmd.h 2014-10-08 13:50:27.451015900 -0700 -@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons - extern char *find_path_file __P((const char *)); - extern char *search_for_command __P((const char *)); - extern char *user_command_matches __P((const char *, int, int)); -+extern void setup_exec_ignore __P((char *)); - - #endif /* _FINDCMD_H_ */ ---- general.c 2009-11-28 18:44:46.000000000 -0800 -+++ general.c 2014-10-08 13:50:27.451015900 -0700 -@@ -43,6 +43,10 @@ - - #include - -+#ifdef __CYGWIN__ -+#include -+#endif -+ - #if !defined (errno) - extern int errno; - #endif /* !errno */ -@@ -601,7 +605,8 @@ make_absolute (string, dot_path) - { - char pathbuf[PATH_MAX + 1]; - -- cygwin_conv_to_full_posix_path (string, pathbuf); -+ cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf, -+ PATH_MAX + 1); - result = savestring (pathbuf); - } - #else ---- input.c 2009-01-04 11:32:29.000000000 -0800 -+++ input.c 2014-10-08 13:50:27.451015900 -0700 -@@ -43,6 +43,10 @@ - #include "externs.h" - #include "quit.h" - -+#if __CYGWIN__ -+int igncr; -+#endif /* __CYGWIN__ */ -+ - #if !defined (errno) - extern int errno; - #endif /* !errno */ -@@ -193,6 +197,10 @@ make_buffered_stream (fd, buffer, bufsiz - bp->b_used = bp->b_inputp = bp->b_flag = 0; - if (bufsize == 1) - bp->b_flag |= B_UNBUFF; -+#if __CYGWIN__ -+ if ((fcntl (fd, F_GETFL) & O_TEXT) != 0) -+ bp->b_flag |= B_TEXT; -+#endif /* __CYGWIN__ */ - return (bp); - } - -@@ -361,11 +369,7 @@ duplicate_buffered_stream (fd1, fd2) - } - - /* Return 1 if a seek on FD will succeed. */ --#ifndef __CYGWIN__ - # define fd_is_seekable(fd) (lseek ((fd), 0L, SEEK_CUR) >= 0) --#else --# define fd_is_seekable(fd) 0 --#endif /* __CYGWIN__ */ - - /* Take FD, a file descriptor, and create and return a buffered stream - corresponding to it. If something is wrong and the file descriptor -@@ -474,6 +478,25 @@ b_fill_buffer (bp) - ssize_t nr; - - CHECK_TERMSIG; -+#ifdef __CYGWIN__ -+ /* lseek'ing on text files is problematic; lseek reports the true -+ file offset, but read collapses \r\n and returns a character -+ count. We cannot reliably seek backwards if nr is smaller than -+ the seek offset encountered during the read, and must instead -+ treat the stream as unbuffered. */ -+ if ((bp->b_flag & (B_TEXT | B_UNBUFF)) == B_TEXT) -+ { -+ off_t offset = lseek (bp->b_fd, 0, SEEK_CUR); -+ nr = zread (bp->b_fd, bp->b_buffer, bp->b_size); -+ if (nr > 0 && nr < lseek (bp->b_fd, 0, SEEK_CUR) - offset) -+ { -+ lseek (bp->b_fd, offset, SEEK_SET); -+ bp->b_flag |= B_UNBUFF; -+ nr = zread (bp->b_fd, bp->b_buffer, bp->b_size = 1); -+ } -+ } -+ else -+#endif /* __CYGWIN__ */ - nr = zread (bp->b_fd, bp->b_buffer, bp->b_size); - if (nr <= 0) - { -@@ -486,15 +509,6 @@ b_fill_buffer (bp) - return (EOF); - } - --#if defined (__CYGWIN__) -- /* If on cygwin, translate \r\n to \n. */ -- if (nr >= 2 && bp->b_buffer[nr - 2] == '\r' && bp->b_buffer[nr - 1] == '\n') -- { -- bp->b_buffer[nr - 2] = '\n'; -- nr--; -- } --#endif -- - bp->b_used = nr; - bp->b_inputp = 0; - return (bp->b_buffer[bp->b_inputp++] & 0xFF); -@@ -543,6 +557,19 @@ buffered_getchar () - { - CHECK_TERMSIG; - -+#if __CYGWIN__ -+ /* shopt igncr means to discard carriage returns from input stream. -+ If cr is the only character in the buffer, then recurse to pick -+ up the next character; otherwise flatten the buffer. */ -+ if (igncr) -+ { -+ int ch; -+ while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd])) -+ == '\r') -+ ; -+ return ch; -+ } -+#endif /* __CYGWIN__ */ - #if !defined (DJGPP) - return (bufstream_getc (buffers[bash_input.location.buffered_fd])); - #else ---- input.h 2009-01-04 11:32:29.000000000 -0800 -+++ input.h 2014-10-08 13:50:27.451015900 -0700 -@@ -48,6 +48,7 @@ enum stream_type {st_none, st_stdin, st_ - #define B_ERROR 0x02 - #define B_UNBUFF 0x04 - #define B_WASBASHINPUT 0x08 -+#define B_TEXT 0x10 /* Text stream, when O_BINARY is nonzero */ - - /* A buffered stream. Like a FILE *, but with our own buffering and - synchronization. Look in input.c for the implementation. */ ---- lib/sh/pathcanon.c 2008-08-12 11:01:37.000000000 -0700 -+++ lib/sh/pathcanon.c 2014-10-08 13:50:27.451015900 -0700 -@@ -194,6 +194,8 @@ sh_canonpath (path, flags) - *q++ = DIRSEP; - while (*p && (ISDIRSEP(*p) == 0)) - *q++ = *p++; -+ } -+ } - /* Check here for a valid directory with _path_isdir. */ - if (flags & PATH_CHECKEXISTS) - { -@@ -211,8 +213,7 @@ sh_canonpath (path, flags) - } - *q = c; - } -- } -- } -+ - - /* Empty string is really ``.'' or `/', depending on what we started with. */ - if (q == result) ---- lib/sh/pathphys.c 2008-08-12 11:01:23.000000000 -0700 -+++ lib/sh/pathphys.c 2014-10-08 13:50:27.451015900 -0700 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include "shell.h" - -@@ -76,6 +77,10 @@ sh_physpath (path, flags) - char *path; - int flags; - { -+#if __CYGWIN__ -+ /* realpath does this right without all the hassle */ -+ return realpath (path, NULL); -+#else - char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1]; - char *result, *p, *q, *qsave, *qbase, *workpath; - int double_slash_path, linklen, nlink; -@@ -249,6 +254,7 @@ error: - } - - return (result); -+#endif /* !__CYGWIN__ */ - } - - char * ---- lib/sh/tmpfile.c 2008-08-12 10:50:12.000000000 -0700 -+++ lib/sh/tmpfile.c 2014-10-08 13:50:27.451015900 -0700 -@@ -40,7 +40,7 @@ - extern int errno; - #endif - --#define BASEOPENFLAGS (O_CREAT | O_TRUNC | O_EXCL) -+#define BASEOPENFLAGS (O_CREAT | O_TRUNC | O_EXCL | O_BINARY) - - #define DEFAULT_TMPDIR "." /* bogus default, should be changed */ - #define DEFAULT_NAMEROOT "shtmp" -@@ -94,7 +94,7 @@ get_tmpdir (flags) - if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX)) - tdir = 0; - -- if (tdir == 0) -+ if (tdir == 0 || !file_iswdir (tdir)) - tdir = get_sys_tmpdir (); - - #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX) -@@ -116,14 +116,15 @@ sh_mktmpname (nameroot, flags) - struct stat sb; - int r, tdlen; - -- filename = (char *)xmalloc (PATH_MAX + 1); -+ filename = NULL; - tdir = get_tmpdir (flags); - tdlen = strlen (tdir); - - lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; - - #ifdef USE_MKTEMP -- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); -+ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) -+ return NULL; - if (mktemp (filename) == 0) - { - free (filename); -@@ -136,7 +137,9 @@ sh_mktmpname (nameroot, flags) - (unsigned long) time ((time_t *)0) ^ - (unsigned long) dollar_dollar_pid ^ - (unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++); -- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); -+ free (filename); -+ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) -+ return NULL; - if (tmpnamelen > 0 && tmpnamelen < 32) - filename[tdlen + 1 + tmpnamelen] = '\0'; - # ifdef HAVE_LSTAT -@@ -161,14 +164,19 @@ sh_mktmpfd (nameroot, flags, namep) - char *filename, *tdir, *lroot; - int fd, tdlen; - -- filename = (char *)xmalloc (PATH_MAX + 1); -+ filename = NULL; - tdir = get_tmpdir (flags); - tdlen = strlen (tdir); - - lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; - - #ifdef USE_MKSTEMP -- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); -+ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) -+ { -+ if (namep) -+ *namep = NULL; -+ return -1; -+ } - fd = mkstemp (filename); - if (fd < 0 || namep == 0) - { -@@ -185,7 +193,13 @@ sh_mktmpfd (nameroot, flags, namep) - (unsigned long) time ((time_t *)0) ^ - (unsigned long) dollar_dollar_pid ^ - (unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++); -- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); -+ free (filename); -+ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) -+ { -+ if (namep) -+ *namep = NULL; -+ return -1; -+ } - if (tmpnamelen > 0 && tmpnamelen < 32) - filename[tdlen + 1 + tmpnamelen] = '\0'; - fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600); ---- parse.y 2014-10-08 13:45:10.394563700 -0700 -+++ parse.y 2014-10-08 13:50:27.451015900 -0700 -@@ -1520,14 +1520,20 @@ yy_string_get () - string = bash_input.location.string; - - /* If the string doesn't exist, or is empty, EOF found. */ -- if (string && *string) -+ while (string && *string) - { - c = *string++; - bash_input.location.string = string; -+#if __CYGWIN__ -+ { -+ extern int igncr; -+ if (igncr && c == '\r') -+ continue; -+ } -+#endif /* __CYGWIN__ */ - return (c); - } -- else -- return (EOF); -+ return (EOF); - } - - static int -@@ -5487,6 +5493,15 @@ report_syntax_error (message) - parser's complaining about by looking at current_token. */ - if (current_token != 0 && EOF_Reached == 0 && (msg = error_token_from_token (current_token))) - { -+#if __CYGWIN__ -+ /* Try to help clueless users. */ -+ char *p = msg; -+ if (ansic_shouldquote (msg)) -+ { -+ msg = ansic_quote (msg, 0, NULL); -+ free (p); -+ } -+#endif /* __CYGWIN__ */ - parser_error (line_number, _("syntax error near unexpected token `%s'"), msg); - free (msg); - ---- pathexp.h 2009-01-04 11:32:40.000000000 -0800 -+++ pathexp.h 2014-10-08 13:50:27.451015900 -0700 -@@ -86,7 +86,7 @@ struct ign { - typedef int sh_iv_item_func_t __P((struct ign *)); - - struct ignorevar { -- char *varname; /* FIGNORE or GLOBIGNORE */ -+ char *varname; /* FIGNORE or GLOBIGNORE or EXECIGNORE */ - struct ign *ignores; /* Store the ignore strings here */ - int num_ignores; /* How many are there? */ - char *last_ignoreval; /* Last value of variable - cached for speed */ ---- redir.c 2009-09-17 07:04:18.000000000 -0700 -+++ redir.c 2014-10-08 13:50:27.451015900 -0700 -@@ -437,7 +437,7 @@ here_document_to_fd (redirectee, ri) - /* In an attempt to avoid races, we close the first fd only after opening - the second. */ - /* Make the document really temporary. Also make it the input. */ -- fd2 = open (filename, O_RDONLY, 0600); -+ fd2 = open (filename, O_RDONLY | O_BINARY, 0600); - - if (fd2 < 0) - { -@@ -453,14 +453,6 @@ here_document_to_fd (redirectee, ri) - if (unlink (filename) < 0) - { - r = errno; --#if defined (__CYGWIN__) -- /* Under CygWin 1.1.0, the unlink will fail if the file is -- open. This hack will allow the previous action of silently -- ignoring the error, but will still leave the file there. This -- needs some kind of magic. */ -- if (r == EACCES) -- return (fd2); --#endif /* __CYGWIN__ */ - close (fd2); - free (filename); - errno = r; ---- shell.c 2009-11-19 07:05:54.000000000 -0800 -+++ shell.c 2014-10-08 13:50:27.466607600 -0700 -@@ -329,7 +329,10 @@ _cygwin32_check_tmp () - struct stat sb; - - if (stat ("/tmp", &sb) < 0) -- internal_warning (_("could not find /tmp, please create!")); -+ { -+ if (mkdir ("/tmp", S_IRWXU | S_IRWXG | S_IRWXO | S_ISVTX) != 0) -+ internal_warning (_("could not find /tmp, please create!")); -+ } - else - { - if (S_ISDIR (sb.st_mode) == 0) -@@ -1471,10 +1474,6 @@ open_shell_script (script_name) - not match with ours. */ - fd = move_to_high_fd (fd, 1, -1); - --#if defined (__CYGWIN__) && defined (O_TEXT) -- setmode (fd, O_TEXT); --#endif -- - #if defined (BUFFERED_INPUT) - default_buffered_input = fd; - SET_CLOSE_ON_EXEC (default_buffered_input); ---- subst.c 2009-12-30 05:24:28.000000000 -0800 -+++ subst.c 2014-10-08 13:50:27.466607600 -0700 -@@ -4921,10 +4921,6 @@ read_comsub (fd, quoted, rflag) - for (skip_ctlesc = skip_ctlnul = 0, s = ifs_value; s && *s; s++) - skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL; - --#ifdef __CYGWIN__ -- setmode (fd, O_TEXT); /* we don't want CR/LF, we want Unix-style */ --#endif -- - /* Read the output of the command through the pipe. This may need to be - changed to understand multibyte characters in the future. */ - while (1) -@@ -4947,6 +4943,13 @@ read_comsub (fd, quoted, rflag) - #endif - continue; - } -+#if __CYGWIN__ -+ { -+ extern int igncr; -+ if (igncr && c == '\r') -+ continue; -+ } -+#endif /* __CYGWIN__ */ - - /* Add the character to ISTRING, possibly after resizing it. */ - RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE); -@@ -5063,6 +5066,27 @@ command_substitute (string, quoted) - sys_error (_("cannot make pipe for command substitution")); - goto error_exit; - } -+#if __CYGWIN__ -+ /* Passing a pipe through std fds can cause hangs when talking to a -+ non-cygwin child. Move it. */ -+ if (fildes[0] < 3) -+ { -+ int fd = fcntl (fildes[0], F_DUPFD, 3); -+ close (fildes[0]); -+ fildes[0] = fd; -+ } -+ if (fildes[1] < 3) -+ { -+ int fd = fcntl (fildes[1], F_DUPFD, 3); -+ close (fildes[1]); -+ fildes[1] = fd; -+ } -+ if (fildes[0] < 0 || fildes[1] < 0) -+ { -+ sys_error (_("cannot make pipe for command substitution")); -+ goto error_exit; -+ } -+#endif /* __CYGWIN__ */ - - old_pid = last_made_pid; - #if defined (JOB_CONTROL) -@@ -5130,6 +5154,12 @@ command_substitute (string, quoted) - (fildes[0] != fileno (stdout)) && - (fildes[0] != fileno (stderr))) - close (fildes[0]); -+#if __CYGWIN__ -+ /* Inform stdio if any text/binary changes happened. */ -+ freopen (NULL, "w", stdout); -+ /* Bash builtins (foolishly) rely on line-buffering. */ -+ sh_setlinebuf (stdout); -+#endif /* __CYGWIN__ */ - - /* The currently executing shell is not interactive. */ - interactive = 0; ---- variables.c 2014-10-08 13:45:10.285364600 -0700 -+++ variables.c 2014-10-08 13:50:27.466607600 -0700 -@@ -4143,6 +4143,8 @@ static struct name_and_function special_ - { "COMP_WORDBREAKS", sv_comp_wordbreaks }, - #endif - -+ { "EXECIGNORE", sv_execignore }, -+ - { "GLOBIGNORE", sv_globignore }, - - #if defined (HISTORY) -@@ -4323,6 +4325,13 @@ sv_globignore (name) - setup_glob_ignore (name); - } - -+/* What to do when EXECIGNORE changes. */ -+void -+sv_execignore (char *name) -+{ -+ setup_exec_ignore (name); -+} -+ - #if defined (READLINE) - void - sv_comp_wordbreaks (name) ---- variables.h 2009-08-16 13:10:15.000000000 -0700 -+++ variables.h 2014-10-08 13:50:27.466607600 -0700 -@@ -351,6 +351,7 @@ extern void sv_ifs __P((char *)); - extern void sv_path __P((char *)); - extern void sv_mail __P((char *)); - extern void sv_globignore __P((char *)); -+extern void sv_execignore __P((char *)); - extern void sv_ignoreeof __P((char *)); - extern void sv_strict_posix __P((char *)); - extern void sv_optind __P((char *)); diff --git a/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch b/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch new file mode 100644 index 000000000000..e0959d0446a6 --- /dev/null +++ b/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch @@ -0,0 +1,1393 @@ +--- bashline.c 2015-02-06 17:12:55.823275600 -0700 ++++ bashline.c 2015-02-06 17:14:11.000103800 -0700 +@@ -71,6 +71,16 @@ + # include "pcomplete.h" + #endif + ++#if __CYGWIN__ ++# ifdef __x86_64__ ++# define IMP(x) __imp_##x ++# else ++# define IMP(x) _imp__##x ++# endif ++#else ++# define IMP(x) x ++#endif ++ + /* These should agree with the defines for emacs_mode and vi_mode in + rldefs.h, even though that's not a public readline header file. */ + #ifndef EMACS_EDITING_MODE +@@ -264,6 +274,11 @@ int no_empty_command_completion; + are the only possible matches, even if FIGNORE says to. */ + int force_fignore = 1; + ++#if __CYGWIN__ ++/* If set, shorten "foo.exe" to "foo" when they are the same file. */ ++int completion_strip_exe; ++#endif /* __CYGWIN__ */ ++ + /* Perform spelling correction on directory names during word completion */ + int dircomplete_spelling = 0; + +@@ -491,11 +506,12 @@ initialize_readline () + kseq[0] = CTRL('J'); + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == rl_vi_editing_mode) ++ extern rl_command_func_t *IMP(rl_vi_editing_mode); ++ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) + rl_unbind_key_in_map (CTRL('J'), emacs_meta_keymap); + kseq[0] = CTRL('M'); + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == rl_vi_editing_mode) ++ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) + rl_unbind_key_in_map (CTRL('M'), emacs_meta_keymap); + #if defined (VI_MODE) + rl_unbind_key_in_map (CTRL('E'), vi_movement_keymap); +@@ -514,7 +530,8 @@ initialize_readline () + kseq[0] = '~'; + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == 0 || func == rl_tilde_expand) ++ extern rl_command_func_t *IMP(rl_tilde_expand); ++ if (func == 0 || func == rl_tilde_expand || func == IMP(rl_tilde_expand)) + rl_bind_keyseq_in_map (kseq, bash_complete_username, emacs_meta_keymap); + + rl_bind_key_if_unbound_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap); +@@ -537,7 +554,8 @@ initialize_readline () + kseq[0] = TAB; + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == 0 || func == rl_tab_insert) ++ extern rl_command_func_t *IMP(rl_tab_insert); ++ if (func == 0 || func == rl_tab_insert || func == IMP(rl_tab_insert)) + rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap); + + /* Tell the completer that we want a crack first. */ +@@ -2109,6 +2127,21 @@ globword: + + if (match && executable_completion ((searching_path ? val : cval), searching_path)) + { ++#if __CYGWIN__ ++ if (completion_strip_exe) ++ { ++ size_t val_len = strlen (val); ++ char *candidate; ++ if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe") ++ && (candidate = strdup (val))) ++ { ++ candidate[val_len - 4] = '\0'; ++ if (same_file (val, candidate, NULL, NULL)) ++ temp[strlen (temp) - 4] = '\0'; ++ free (candidate); ++ } ++ } ++#endif + if (cval != val) + free (cval); + free (val); +@@ -2844,6 +2877,17 @@ test_for_directory (name) + int r; + + fn = bash_tilde_expand (name, 0); ++#if __CYGWIN__ ++ /* stat("//server") can only be successful as a directory, but takes ++ a several-second timeout to fail. It is much faster to assume ++ that //server is a valid name than it is to wait for the stat, ++ even though it gives false positives on bad names. */ ++ if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/')) ++ { ++ free (fn); ++ return 1; ++ } ++#endif /* __CYGWIN__ */ + r = file_isdir (fn); + free (fn); + +--- builtins/evalstring.c 2015-02-06 17:12:55.682776800 -0700 ++++ builtins/evalstring.c 2015-02-06 17:14:11.015662800 -0700 +@@ -195,7 +195,7 @@ parse_and_execute (string, from_file, fl + int code, lreset; + volatile int should_jump_to_top_level, last_result; + COMMAND *volatile command; +- volatile sigset_t pe_sigmask; ++ sigset_t pe_sigmask; + + parse_prologue (string, flags, PE_TAG); + +@@ -451,7 +451,7 @@ parse_string (string, from_file, flags, + volatile int should_jump_to_top_level; + COMMAND *volatile command, *oglobal; + char *ostring; +- volatile sigset_t ps_sigmask; ++ sigset_t ps_sigmask; + + parse_prologue (string, flags, PS_TAG); + +--- builtins/set.def 2013-04-19 05:20:34.000000000 -0600 ++++ builtins/set.def 2015-02-06 17:14:11.015662800 -0700 +@@ -56,6 +56,13 @@ extern int dont_save_function_defs; + #if defined (READLINE) + extern int no_line_editing; + #endif /* READLINE */ ++#if __CYGWIN__ ++extern int igncr; ++static int set_minus_o_option_maybe (int, const char *, int); ++# define INTERACTIVE_ONLY ,1 ++#else /* ! __CYGWIN__ */ ++# define INTERACTIVE_ONLY ++#endif + + $BUILTIN set + $FUNCTION set_builtin +@@ -92,6 +99,9 @@ Options: + #if defined (HISTORY) + history enable command history + #endif ++#if __CYGWIN__ ++ igncr on cygwin, ignore \r in line endings ++#endif + ignoreeof the shell will not exit upon reading EOF + interactive-comments + allow comments to appear in interactive commands +@@ -188,29 +198,41 @@ const struct { + int *variable; + setopt_set_func_t *set_func; + setopt_get_func_t *get_func; ++#if __CYGWIN__ ++ /* Cygwin users have taken to exporting SHELLOPTS for the ++ cygwin-specific igncr. As a result, we need to make sure ++ SHELLOPTS parsing does not turn on interactive options when ++ exported from an interactive shell, but parsed in a ++ non-interactive setting, since some interactive options violate ++ POSIX /bin/sh rules. */ ++ int interactive_only; ++#endif /* __CYGWIN__ */ + } o_options[] = { + { "allexport", 'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (BRACE_EXPANSION) + { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #endif + #if defined (READLINE) +- { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, ++ { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, + #endif + { "errexit", 'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "errtrace", 'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "functrace", 'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "hashall", 'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (BANG_HISTORY) +- { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, ++ { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, + #endif /* BANG_HISTORY */ + #if defined (HISTORY) +- { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL }, ++ { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, ++#endif ++#if __CYGWIN__ ++ { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL }, + #endif + { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL }, + { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "keyword", 'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (JOB_CONTROL) +- { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, ++ { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, + #endif + { "noclobber", 'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "noexec", 'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, +@@ -229,7 +251,7 @@ const struct { + { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "verbose", 'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (READLINE) +- { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, ++ { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, + #endif + { "xtrace", 'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, +@@ -416,6 +438,15 @@ int + set_minus_o_option (on_or_off, option_name) + int on_or_off; + char *option_name; ++#if __CYGWIN__ ++{ ++ /* See cygwin comments above. */ ++ return set_minus_o_option_maybe (on_or_off, option_name, 0); ++} ++static int ++set_minus_o_option_maybe (int on_or_off, const char *option_name, ++ int avoid_interactive) ++#endif /* __CYGWIN__ */ + { + register int i; + +@@ -423,6 +454,10 @@ set_minus_o_option (on_or_off, option_na + { + if (STREQ (option_name, o_options[i].name)) + { ++#if __CYGWIN__ ++ if (o_options[i].interactive_only && avoid_interactive) ++ return EXECUTION_SUCCESS; ++#endif /* __CYGWIN__ */ + if (o_options[i].letter == 0) + { + SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name); +@@ -548,7 +583,11 @@ parse_shellopts (value) + vptr = 0; + while (vname = extract_colon_unit (value, &vptr)) + { ++#if __CYGWIN__ ++ set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell); ++#else /* !__CYGWIN__ */ + set_minus_o_option (FLAG_ON, vname); ++#endif + free (vname); + } + } +--- builtins/shopt.def 2013-02-27 07:43:20.000000000 -0700 ++++ builtins/shopt.def 2015-02-06 17:14:11.015662800 -0700 +@@ -91,6 +91,11 @@ extern int glob_star; + extern int glob_asciirange; + extern int lastpipe_opt; + ++#if __CYGWIN__ ++extern int completion_strip_exe; ++#endif ++ ++ + #if defined (EXTENDED_GLOB) + extern int extended_glob; + #endif +@@ -161,6 +166,9 @@ static struct { + { "compat40", &shopt_compat40, set_compatibility_level }, + { "compat41", &shopt_compat41, set_compatibility_level }, + { "compat42", &shopt_compat41, set_compatibility_level }, ++#if __CYGWIN__ ++ { "completion_strip_exe", &completion_strip_exe, NULL }, ++#endif + #if defined (READLINE) + { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, + { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, +--- config-top.h 2012-08-18 18:51:30.000000000 -0600 ++++ config-top.h 2015-02-06 17:14:11.015662800 -0700 +@@ -80,10 +80,10 @@ + #define KSH_COMPATIBLE_SELECT + + /* System-wide .bashrc file for interactive shells. */ +-/* #define SYS_BASHRC "/etc/bash.bashrc" */ ++#define SYS_BASHRC "/etc/bash.bashrc" + + /* System-wide .bash_logout for login shells. */ +-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ ++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" + + /* Define this to make non-interactive shells begun with argv[0][0] == '-' + run the startup files when not in posix mode. */ +@@ -93,7 +93,7 @@ + sshd and source the .bashrc if so (like the rshd behavior). This checks + for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment, + which can be fooled under certain not-uncommon circumstances. */ +-/* #define SSH_SOURCE_BASHRC */ ++#define SSH_SOURCE_BASHRC + + /* Define if you want the case-capitalizing operators (~[~]) and the + `capcase' variable attribute (declare -c). */ +--- doc/Makefile.in 2013-10-30 14:18:12.000000000 -0600 ++++ doc/Makefile.in 2015-02-06 17:14:11.015662800 -0700 +@@ -176,7 +176,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER) + $(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi + + bash.info: bashref.info +- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \ ++ ${SHELL} ${INFOPOST} < bashref.info > $@ ; \ + + bash.txt: bash.1 + bash.ps: bash.1 +@@ -237,9 +237,9 @@ install: info installdirs bash.info + -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext} + -$(INSTALL_DATA) $(OTHER_DOCS) $(DESTDIR)$(docdir) + # uncomment the next lines to install the builtins man page +-# sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 +-# -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} +-# -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 ++ sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 ++ -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} ++ -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 + -if test -f bash.info; then d=.; else d=$(srcdir); fi; \ + $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info + # run install-info if it is present to update the info directory +--- doc/bash.1 2014-02-06 07:03:52.000000000 -0700 ++++ doc/bash.1 2015-02-06 17:14:11.015662800 -0700 +@@ -1658,6 +1658,14 @@ subsequently reset. + Expands to the effective user ID of the current user, initialized at + shell startup. This variable is readonly. + .TP ++.B EXECIGNORE ++A colon-separated list of extended glob (see \fBPattern Matching\fP) ++patterns. Files with full paths matching one of these patterns are ++not considered executable for the purposes of completion and PATH ++searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not ++affected. Use this variable to deal with systems that set the ++executable bit on files that are not actually executable. ++.TP + .B FUNCNAME + An array variable containing the names of all shell functions + currently in the execution call stack. +@@ -3308,6 +3316,10 @@ the character + .B ``.'' + at the start of a name or immediately following a slash + must be matched explicitly, unless the shell option ++.B completion_strip_exe ++If set, whenever bash sees `foo.exe' during completion, it checks if ++`foo' is the same file and strips the suffix. ++.TP 8 + .B dotglob + is set. + When matching a pathname, the slash character must always be +--- doc/bashref.texi 2014-02-22 11:20:36.000000000 -0700 ++++ doc/bashref.texi 2015-02-06 17:14:11.015662800 -0700 +@@ -4992,6 +4992,10 @@ filenames. + This variable is set by default, which is the default Bash behavior in + versions through 4.2. + ++@item completion_strip_exe ++If set, whenever bash sees `foo.exe' during completion, it checks if ++`foo' is the same file and strips the suffix. ++ + @item direxpand + If set, Bash + replaces directory names with the results of word expansion when performing +@@ -5578,6 +5582,14 @@ Similar to @code{BASH_ENV}; used when th + The numeric effective user id of the current user. This variable + is readonly. + ++@item EXECIGNORE ++A colon-separated list of extended glob ((@pxref{Pattern Matching}) ++patterns. Files with full paths matching one of these patterns are ++not considered executable for the purposes of completion and PATH ++searching, but the @code{[}, @code{[[}, and @code{test} builtins are ++not affected. Use this variable to deal with systems that set the ++executable bit on files that are not actually executable. ++ + @item FCEDIT + The editor used as a default by the @option{-e} option to the @code{fc} + builtin command. +--- doc/builtins.1 2012-02-21 12:32:05.000000000 -0700 ++++ doc/builtins.1 2015-02-06 17:14:11.031260100 -0700 +@@ -19,6 +19,6 @@ shift, shopt, source, suspend, test, tim + ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1) + .SH BASH BUILTIN COMMANDS + .nr zZ 1 +-.so bash.1 ++.so man1/bash.1 + .SH SEE ALSO + bash(1), sh(1) +--- execute_cmd.c 2015-02-06 17:12:55.261573700 -0700 ++++ execute_cmd.c 2015-02-06 17:14:11.031260100 -0700 +@@ -58,6 +58,7 @@ extern int errno; + #endif + + #define NEED_FPURGE_DECL ++#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */ + + #include "bashansi.h" + #include "bashintl.h" +--- expr.c 2014-01-03 06:55:00.000000000 -0700 ++++ expr.c 2015-02-06 17:14:11.031260100 -0700 +@@ -83,6 +83,7 @@ + + #include "shell.h" + #include "typemax.h" /* INTMAX_MAX, INTMAX_MIN */ ++#define exp2 exp2_ + + /* Because of the $((...)) construct, expressions may include newlines. + Here is a macro which accepts newlines, tabs and spaces as whitespace. */ +--- findcmd.c 2012-10-15 05:45:04.000000000 -0600 ++++ findcmd.c 2015-02-06 17:14:11.031260100 -0700 +@@ -48,6 +48,8 @@ + extern int errno; + #endif + ++#include ++ + extern int posixly_correct; + extern int last_command_exit_value; + +@@ -77,6 +79,38 @@ int check_hashed_filenames; + containing the file of interest. */ + int dot_found_in_search = 0; + ++static struct ignorevar execignore = ++{ ++ "EXECIGNORE", ++ (struct ign *)0, ++ 0, ++ (char *)0, ++ (sh_iv_item_func_t *)0, ++}; ++ ++void ++setup_exec_ignore (char *varname) ++{ ++ setup_ignore_patterns (&execignore); ++} ++ ++/* Return whether we should never consider file executable ++ * even if the system tells us it is. */ ++static int ++is_on_exec_blacklist (char *name) ++{ ++ struct ign *p; ++ int flags = FNM_EXTMATCH | FNM_CASEFOLD; ++ ++ for (p = execignore.ignores; p && p->val; p++) ++ { ++ if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH) ++ return (1); ++ } ++ ++ return (0); ++} ++ + /* Return some flags based on information about this file. + The EXISTS bit is non-zero if the file is found. + The EXECABLE bit is non-zero the file is executble. +@@ -104,7 +138,7 @@ file_status (name) + file access mechanisms into account. eaccess uses the effective + user and group IDs, not the real ones. We could use sh_eaccess, + but we don't want any special treatment for /dev/fd. */ +- if (eaccess (name, X_OK) == 0) ++ if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0) + r |= FS_EXECABLE; + if (eaccess (name, R_OK) == 0) + r |= FS_READABLE; +--- findcmd.h 2012-01-14 16:56:25.000000000 -0700 ++++ findcmd.h 2015-02-06 17:14:11.031260100 -0700 +@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons + extern char *find_path_file __P((const char *)); + extern char *search_for_command __P((const char *, int)); + extern char *user_command_matches __P((const char *, int, int)); ++extern void setup_exec_ignore __P((char *)); + + #endif /* _FINDCMD_H_ */ +--- general.c 2014-01-30 14:46:15.000000000 -0700 ++++ general.c 2015-02-06 17:14:11.031260100 -0700 +@@ -44,6 +44,10 @@ + + #include + ++#ifdef __CYGWIN__ ++# include ++#endif ++ + #if !defined (errno) + extern int errno; + #endif /* !errno */ +@@ -632,7 +636,8 @@ make_absolute (string, dot_path) + { + char pathbuf[PATH_MAX + 1]; + +- cygwin_conv_to_full_posix_path (string, pathbuf); ++ cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf, ++ sizeof pathbuf); + result = savestring (pathbuf); + } + #else +--- include/chartypes.h 2011-04-11 12:30:52.000000000 -0600 ++++ include/chartypes.h 2015-02-06 17:14:11.031260100 -0700 +@@ -40,6 +40,7 @@ + #else + # define IN_CTYPE_DOMAIN(c) isascii(c) + #endif ++#define to_uchar(c) ((unsigned char)(c)) + + #if !defined (isspace) && !defined (HAVE_ISSPACE) + # define isspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\n' || (c) == '\f') +@@ -67,16 +68,16 @@ + + #undef ISPRINT + +-#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) +-#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) +-#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c)) +-#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) +-#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c)) +-#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) +-#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (c)) +-#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) +-#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) +-#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c)) ++#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (to_uchar (c))) ++#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (to_uchar (c))) ++#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (to_uchar (c))) ++#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (to_uchar (c))) ++#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (to_uchar (c))) ++#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (to_uchar (c))) ++#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (to_uchar (c))) ++#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (to_uchar (c))) ++#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (to_uchar (c))) ++#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (to_uchar (c))) + + #define ISLETTER(c) (ISALPHA(c)) + +--- include/posixjmp.h 2012-12-23 20:20:50.000000000 -0700 ++++ include/posixjmp.h 2015-02-06 17:14:11.031260100 -0700 +@@ -27,13 +27,13 @@ + + #if defined (HAVE_POSIX_SIGSETJMP) + # define procenv_t sigjmp_buf +-# if !defined (__OPENNT) ++# if !defined (__OPENNT) && !defined __CYGWIN__ + # undef setjmp + # define setjmp(x) sigsetjmp((x), 1) +-# define setjmp_nosigs(x) sigsetjmp((x), 0) + # undef longjmp + # define longjmp(x, n) siglongjmp((x), (n)) + # endif /* !__OPENNT */ ++# define setjmp_nosigs(x) sigsetjmp((x), 0) + #else + # define procenv_t jmp_buf + # define setjmp_nosigs setjmp +--- input.c 2014-02-07 07:13:08.000000000 -0700 ++++ input.c 2015-02-06 17:14:11.031260100 -0700 +@@ -44,6 +44,10 @@ + #include "quit.h" + #include "trap.h" + ++#if __CYGWIN__ ++int igncr; ++#endif ++ + #if !defined (errno) + extern int errno; + #endif /* !errno */ +@@ -561,6 +565,19 @@ buffered_getchar () + { + CHECK_TERMSIG; + ++#if __CYGWIN__ ++ /* shopt igncr means to discard carriage returns from input stream. ++ If cr is the only character in the buffer, then recurse to pick ++ up the next character; otherwise flatten the buffer. */ ++ if (igncr) ++ { ++ int ch; ++ while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd])) ++ == '\r') ++ ; ++ return ch; ++ } ++#endif /* __CYGWIN__ */ + #if !defined (DJGPP) + return (bufstream_getc (buffers[bash_input.location.buffered_fd])); + #else +--- lib/readline/bind.c 2013-04-06 15:46:38.000000000 -0600 ++++ lib/readline/bind.c 2015-02-06 17:14:11.031260100 -0700 +@@ -452,7 +452,7 @@ rl_translate_keyseq (seq, array, len) + { + register int i, c, l, temp; + +- for (i = l = 0; c = seq[i]; i++) ++ for (i = l = 0; (c = seq[i]); i++) + { + if (c == '\\') + { +@@ -1210,7 +1210,7 @@ _rl_skip_to_delim (string, start, delim) + { + int i, c, passc; + +- for (i = start,passc = 0; c = string[i]; i++) ++ for (i = start,passc = 0; (c = string[i]); i++) + { + if (passc) + { +@@ -1297,7 +1297,6 @@ rl_parse_and_bind (string) + if (_rl_stricmp (string, "set") == 0) + { + char *var, *value, *e; +- int s; + + var = string + i; + /* Make VAR point to start of variable name. */ +@@ -2198,7 +2197,7 @@ rl_function_dumper (print_readably) + + fprintf (rl_outstream, "\n"); + +- for (i = 0; name = names[i]; i++) ++ for (i = 0; (name = names[i]); i++) + { + rl_command_func_t *function; + char **invokers; +--- lib/readline/chardefs.h 2011-07-25 19:47:56.000000000 -0600 ++++ lib/readline/chardefs.h 2015-02-06 17:14:11.046889800 -0700 +@@ -71,6 +71,7 @@ + #else + # define IN_CTYPE_DOMAIN(c) isascii(c) + #endif ++#define to_uchar(c) ((unsigned char)(c)) + + #if !defined (isxdigit) && !defined (HAVE_ISXDIGIT) && !defined (__cplusplus) + # define isxdigit(c) (isdigit((c)) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F')) +@@ -87,13 +88,13 @@ + + /* Beware: these only work with single-byte ASCII characters. */ + +-#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c)) +-#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) +-#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) +-#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) +-#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) +-#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) +-#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c)) ++#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (to_uchar (c))) ++#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (to_uchar (c))) ++#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (to_uchar (c))) ++#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (to_uchar (c))) ++#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (to_uchar (c))) ++#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (to_uchar (c))) ++#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (to_uchar (c))) + + #define _rl_lowercase_p(c) (NON_NEGATIVE(c) && ISLOWER(c)) + #define _rl_uppercase_p(c) (NON_NEGATIVE(c) && ISUPPER(c)) +--- lib/readline/complete.c 2013-10-14 07:27:10.000000000 -0600 ++++ lib/readline/complete.c 2015-02-06 17:14:11.046889800 -0700 +@@ -1082,7 +1082,7 @@ _rl_find_completion_word (fp, dp) + /* We didn't find an unclosed quoted substring upon which to do + completion, so use the word break characters to find the + substring on which to complete. */ +- while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)) ++ while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))) + { + scan = rl_line_buffer[rl_point]; + +@@ -2116,7 +2116,7 @@ rl_completion_matches (text, entry_funct + match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *)); + match_list[1] = (char *)NULL; + +- while (string = (*entry_function) (text, matches)) ++ while ((string = (*entry_function) (text, matches))) + { + if (RL_SIG_RECEIVED ()) + { +@@ -2190,7 +2190,7 @@ rl_username_completion_function (text, s + } + + #if defined (HAVE_GETPWENT) +- while (entry = getpwent ()) ++ while ((entry = getpwent ())) + { + /* Null usernames should result in all users as possible completions. */ + if (namelen == 0 || (STREQN (username, entry->pw_name, namelen))) +@@ -2723,7 +2723,7 @@ rl_menu_complete (count, ignore) + static int full_completion = 0; /* set to 1 if menu completion should reinitialize on next call */ + static int orig_start, orig_end; + static char quote_char; +- static int delimiter, cstate; ++ static int delimiter; + + /* The first time through, we generate the list of matches and set things + up to insert them. */ +--- lib/readline/display.c 2015-02-06 17:12:54.793574600 -0700 ++++ lib/readline/display.c 2015-02-06 17:14:11.046889800 -0700 +@@ -66,7 +66,6 @@ extern char *strchr (), *strrchr (); + static void update_line PARAMS((char *, char *, int, int, int, int)); + static void space_to_eol PARAMS((int)); + static void delete_chars PARAMS((int)); +-static void insert_some_chars PARAMS((char *, int, int)); + static void open_some_spaces PARAMS((int)); + static void cr PARAMS((void)); + +@@ -1314,7 +1313,7 @@ update_line (old, new, current_line, oma + int current_line, omax, nmax, inv_botlin; + { + register char *ofd, *ols, *oe, *nfd, *nls, *ne; +- int temp, lendiff, wsatend, od, nd, twidth, o_cpos; ++ int temp, lendiff, wsatend, od, nd, o_cpos; + int current_invis_chars; + int col_lendiff, col_temp; + int bytes_to_insert; +@@ -2485,6 +2484,7 @@ _rl_clear_screen () + #endif /* __DJGPP__ */ + } + ++#if 0 + /* Insert COUNT characters from STRING to the output stream at column COL. */ + static void + insert_some_chars (string, count, col) +@@ -2494,6 +2494,7 @@ insert_some_chars (string, count, col) + open_some_spaces (col); + _rl_output_some_chars (string, count); + } ++#endif + + /* Insert COL spaces, keeping the cursor at the same position. We follow the + ncurses documentation and use either im/ei with explicit spaces, or IC/ic +--- lib/readline/histexpand.c 2013-12-02 07:22:30.000000000 -0700 ++++ lib/readline/histexpand.c 2015-02-06 17:14:11.046889800 -0700 +@@ -204,7 +204,7 @@ get_history_event (string, caller_index, + } + + /* Only a closing `?' or a newline delimit a substring search string. */ +- for (local_index = i; c = string[i]; i++) ++ for (local_index = i; (c = string[i]); i++) + { + #if defined (HANDLE_MULTIBYTE) + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) +@@ -677,7 +677,7 @@ history_expand_internal (string, start, + case 's': + { + char *new_event; +- int delimiter, failed, si, l_temp, ws, we; ++ int delimiter, failed, si, l_temp, we; + + if (c == 's') + { +@@ -776,7 +776,6 @@ history_expand_internal (string, start, + { + for (; temp[si] && whitespace (temp[si]); si++) + ; +- ws = si; + we = history_tokenize_word (temp, si); + } + +--- lib/readline/histfile.c 2013-07-19 06:17:17.000000000 -0600 ++++ lib/readline/histfile.c 2015-02-06 17:14:11.046889800 -0700 +@@ -104,7 +104,7 @@ int history_write_timestamps = 0; + + /* Does S look like the beginning of a history timestamp entry? Placeholder + for more extensive tests. */ +-#define HIST_TIMESTAMP_START(s) (*(s) == history_comment_char && isdigit ((s)[1]) ) ++#define HIST_TIMESTAMP_START(s) (*(s) == history_comment_char && isdigit ((unsigned char) (s)[1]) ) + + /* Return the string that should be used in the place of this + filename. This only matters when you don't specify the +--- lib/readline/input.c 2015-02-06 17:12:55.027577800 -0700 ++++ lib/readline/input.c 2015-02-06 17:14:11.046889800 -0700 +@@ -431,7 +431,7 @@ rl_read_key () + else + { + /* If input is coming from a macro, then use that. */ +- if (c = _rl_next_macro_key ()) ++ if ((c = _rl_next_macro_key ())) + return (c); + + /* If the user has an event function, then call it periodically. */ +--- lib/readline/isearch.c 2013-10-14 07:08:40.000000000 -0600 ++++ lib/readline/isearch.c 2015-02-06 17:14:11.046889800 -0700 +@@ -740,7 +740,7 @@ rl_search_history (direction, invoking_k + int direction, invoking_key; + { + _rl_search_cxt *cxt; /* local for now, but saved globally */ +- int c, r; ++ int r; + + RL_SETSTATE(RL_STATE_ISEARCH); + cxt = _rl_isearch_init (direction); +@@ -755,7 +755,7 @@ rl_search_history (direction, invoking_k + r = -1; + for (;;) + { +- c = _rl_search_getchar (cxt); ++ _rl_search_getchar (cxt); + /* We might want to handle EOF here (c == 0) */ + r = _rl_isearch_dispatch (cxt, cxt->lastc); + if (r <= 0) +@@ -778,9 +778,9 @@ int + _rl_isearch_callback (cxt) + _rl_search_cxt *cxt; + { +- int c, r; ++ int r; + +- c = _rl_search_getchar (cxt); ++ _rl_search_getchar (cxt); + /* We might want to handle EOF here */ + r = _rl_isearch_dispatch (cxt, cxt->lastc); + +--- lib/readline/misc.c 2015-02-06 17:12:55.230384200 -0700 ++++ lib/readline/misc.c 2015-02-06 17:14:11.046889800 -0700 +@@ -455,7 +455,7 @@ _rl_revert_all_lines () + entry = (hpos == history_length) ? previous_history () : current_history (); + while (entry) + { +- if (ul = (UNDO_LIST *)entry->data) ++ if ((ul = (UNDO_LIST *)entry->data)) + { + if (ul == saved_undo_list) + saved_undo_list = 0; +@@ -502,7 +502,7 @@ rl_clear_history () + for (i = 0; i < history_length; i++) + { + hent = hlist[i]; +- if (ul = (UNDO_LIST *)hent->data) ++ if ((ul = (UNDO_LIST *)hent->data)) + { + if (ul == saved_undo_list) + saved_undo_list = 0; +--- lib/readline/nls.c 2013-03-09 12:51:10.000000000 -0700 ++++ lib/readline/nls.c 2015-02-06 17:14:11.046889800 -0700 +@@ -80,7 +80,7 @@ static char *legal_lang_values[] = + static char *normalize_codeset PARAMS((char *)); + #endif /* !HAVE_SETLOCALE */ + +-static char *find_codeset PARAMS((char *, size_t *)); ++static char *find_codeset PARAMS((char *, size_t *)) __attribute__ ((__unused__)); + + static char *_rl_get_locale_var PARAMS((const char *)); + +@@ -104,12 +104,13 @@ utf8locale (lspec) + char *lspec; + { + char *cp; +- size_t len; + + #if HAVE_LANGINFO_CODESET + cp = nl_langinfo (CODESET); + return (STREQ (cp, "UTF-8") || STREQ (cp, "utf8")); + #else ++ size_t len; ++ + cp = find_codeset (lspec, &len); + + if (cp == 0 || len < 4 || len > 5) +--- lib/readline/parens.c 2009-04-19 11:12:06.000000000 -0600 ++++ lib/readline/parens.c 2015-02-06 17:14:11.046889800 -0700 +@@ -106,7 +106,7 @@ rl_insert_close (count, invoking_key) + else + { + #if defined (HAVE_SELECT) +- int orig_point, match_point, ready; ++ int orig_point, match_point; + struct timeval timer; + fd_set readfds; + +@@ -126,7 +126,7 @@ rl_insert_close (count, invoking_key) + orig_point = rl_point; + rl_point = match_point; + (*rl_redisplay_function) (); +- ready = select (1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer); ++ select (1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer); + rl_point = orig_point; + #else /* !HAVE_SELECT */ + _rl_insert_char (count, invoking_key); +--- lib/readline/posixjmp.h 2012-12-23 20:20:50.000000000 -0700 ++++ lib/readline/posixjmp.h 2015-02-06 17:14:11.046889800 -0700 +@@ -27,13 +27,13 @@ + + #if defined (HAVE_POSIX_SIGSETJMP) + # define procenv_t sigjmp_buf +-# if !defined (__OPENNT) ++# if !defined (__OPENNT) && !defined __CYGWIN__ + # undef setjmp + # define setjmp(x) sigsetjmp((x), 1) +-# define setjmp_nosigs(x) sigsetjmp((x), 0) + # undef longjmp + # define longjmp(x, n) siglongjmp((x), (n)) + # endif /* !__OPENNT */ ++# define setjmp_nosigs(x) sigsetjmp((x), 0) + #else + # define procenv_t jmp_buf + # define setjmp_nosigs setjmp +--- lib/readline/readline.c 2015-02-06 17:12:54.310964200 -0700 ++++ lib/readline/readline.c 2015-02-06 17:14:11.046889800 -0700 +@@ -95,7 +95,7 @@ static void bind_arrow_keys_internal PAR + static void bind_arrow_keys PARAMS((void)); + + static void readline_default_bindings PARAMS((void)); +-static void reset_default_bindings PARAMS((void)); ++//static void reset_default_bindings PARAMS((void)); + + static int _rl_subseq_result PARAMS((int, Keymap, int, int)); + static int _rl_subseq_getchar PARAMS((int)); +@@ -522,7 +522,7 @@ readline_internal_char () + readline_internal_charloop () + #endif + { +- static int lastc, eof_found; ++ static int lastc, eof_found __attribute__((unused)); + int c, code, lk; + + lastc = -1; +@@ -1204,6 +1204,7 @@ readline_default_bindings () + rl_tty_set_default_bindings (_rl_keymap); + } + ++#if 0 + /* Reset the default bindings for the terminal special characters we're + interested in back to rl_insert and read the new ones. */ + static void +@@ -1215,6 +1216,7 @@ reset_default_bindings () + rl_tty_set_default_bindings (_rl_keymap); + } + } ++#endif + + /* Bind some common arrow key sequences in MAP. */ + static void +--- lib/readline/rltty.c 2013-08-25 14:57:05.000000000 -0600 ++++ lib/readline/rltty.c 2015-02-06 17:14:11.062454900 -0700 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #if defined (HAVE_UNISTD_H) + # include +--- lib/readline/shell.c 2013-03-13 08:17:00.000000000 -0600 ++++ lib/readline/shell.c 2015-02-06 17:14:11.062454900 -0700 +@@ -123,8 +123,10 @@ sh_single_quote (string) + /* Set the environment variables LINES and COLUMNS to lines and cols, + respectively. */ + static char setenv_buf[INT_STRLEN_BOUND (int) + 1]; ++# if !defined (HAVE_SETENV) && defined (HAVE_PUTENV) + static char putenv_buf1[INT_STRLEN_BOUND (int) + 6 + 1]; /* sizeof("LINES=") == 6 */ + static char putenv_buf2[INT_STRLEN_BOUND (int) + 8 + 1]; /* sizeof("COLUMNS=") == 8 */ ++# endif + + void + sh_set_lines_and_columns (lines, cols) +--- lib/readline/signals.c 2014-01-10 13:06:48.000000000 -0700 ++++ lib/readline/signals.c 2015-02-06 17:14:11.062454900 -0700 +@@ -576,7 +576,6 @@ rl_free_line_state () + /* **************************************************************** */ + + #if defined (HAVE_POSIX_SIGNALS) +-static sigset_t sigint_set, sigint_oset; + static sigset_t sigwinch_set, sigwinch_oset; + #else /* !HAVE_POSIX_SIGNALS */ + # if defined (HAVE_BSD_SIGNALS) +--- lib/readline/terminal.c 2013-09-18 07:12:01.000000000 -0600 ++++ lib/readline/terminal.c 2015-02-06 17:14:11.062454900 -0700 +@@ -31,6 +31,7 @@ + #if defined (HAVE_SYS_FILE_H) + # include + #endif /* HAVE_SYS_FILE_H */ ++#include + + #if defined (HAVE_UNISTD_H) + # include +--- lib/readline/text.c 2013-10-14 07:25:05.000000000 -0600 ++++ lib/readline/text.c 2015-02-06 17:14:11.062454900 -0700 +@@ -859,11 +859,10 @@ _rl_overwrite_char (count, c) + int i; + #if defined (HANDLE_MULTIBYTE) + char mbkey[MB_LEN_MAX]; +- int k; + + /* Read an entire multibyte character sequence to insert COUNT times. */ + if (count > 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0) +- k = _rl_read_mbstring (c, mbkey, MB_LEN_MAX); ++ _rl_read_mbstring (c, mbkey, MB_LEN_MAX); + #endif + + rl_begin_undo_group (); +--- lib/readline/tilde.c 2010-07-25 15:42:13.000000000 -0600 ++++ lib/readline/tilde.c 2015-02-06 17:14:11.062454900 -0700 +@@ -196,7 +196,7 @@ tilde_expand (string) + int result_size, result_index; + + result_index = result_size = 0; +- if (result = strchr (string, '~')) ++ if ((result = strchr (string, '~'))) + result = (char *)xmalloc (result_size = (strlen (string) + 16)); + else + result = (char *)xmalloc (result_size = (strlen (string) + 1)); +--- lib/readline/undo.c 2014-02-02 13:47:46.000000000 -0700 ++++ lib/readline/undo.c 2015-02-06 17:14:11.062454900 -0700 +@@ -124,7 +124,7 @@ _rl_free_undo_list (ul) + void + rl_free_undo_list () + { +- UNDO_LIST *release, *orig_list; ++ UNDO_LIST *orig_list; + + orig_list = rl_undo_list; + _rl_free_undo_list (rl_undo_list); +--- lib/readline/vi_mode.c 2012-09-01 16:55:30.000000000 -0600 ++++ lib/readline/vi_mode.c 2015-02-06 17:14:11.062454900 -0700 +@@ -1089,7 +1089,7 @@ static int + rl_domove_motion_callback (m) + _rl_vimotion_cxt *m; + { +- int c, save, r; ++ int c, r; + int old_end; + + _rl_vi_last_motion = c = m->motion; +@@ -1257,7 +1257,6 @@ int + rl_vi_domove (x, ignore) + int x, *ignore; + { +- int r; + _rl_vimotion_cxt *m; + + m = _rl_vimvcxt; +--- lib/sh/pathphys.c 2013-05-28 13:33:58.000000000 -0600 ++++ lib/sh/pathphys.c 2015-02-06 17:14:11.062454900 -0700 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include "shell.h" + +@@ -76,6 +77,10 @@ sh_physpath (path, flags) + char *path; + int flags; + { ++#if __CYGWIN__ ++ /* realpath does this correctly without all the hassle */ ++ return realpath (path, NULL); ++#else + char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1]; + char *result, *p, *q, *qsave, *qbase, *workpath; + int double_slash_path, linklen, nlink; +@@ -214,11 +219,7 @@ error: + { + q = result; + /* Duplicating some code here... */ +-#if defined (__CYGWIN__) +- qbase = (ISALPHA((unsigned char)workpath[0]) && workpath[1] == ':') ? workpath + 3 : workpath + 1; +-#else + qbase = workpath + 1; +-#endif + double_slash_path = DOUBLE_SLASH (workpath); + qbase += double_slash_path; + +@@ -249,6 +250,7 @@ error: + } + + return (result); ++#endif /* ! __CYGWIN__ */ + } + + char * +--- lib/sh/tmpfile.c 2013-12-18 15:50:13.000000000 -0700 ++++ lib/sh/tmpfile.c 2015-02-06 17:14:11.062454900 -0700 +@@ -96,7 +96,7 @@ get_tmpdir (flags) + if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX)) + tdir = 0; + +- if (tdir == 0) ++ if (tdir == 0 || !file_iswdir (tdir)) + tdir = get_sys_tmpdir (); + + #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX) +@@ -118,14 +118,15 @@ sh_mktmpname (nameroot, flags) + struct stat sb; + int r, tdlen; + +- filename = (char *)xmalloc (PATH_MAX + 1); ++ filename = NULL; + tdir = get_tmpdir (flags); + tdlen = strlen (tdir); + + lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; + + #ifdef USE_MKTEMP +- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); ++ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) ++ return NULL; + if (mktemp (filename) == 0) + { + free (filename); +@@ -138,7 +139,9 @@ sh_mktmpname (nameroot, flags) + (unsigned long) time ((time_t *)0) ^ + (unsigned long) dollar_dollar_pid ^ + (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++); +- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); ++ free (filename); ++ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) ++ return NULL; + if (tmpnamelen > 0 && tmpnamelen < 32) + filename[tdlen + 1 + tmpnamelen] = '\0'; + # ifdef HAVE_LSTAT +@@ -163,14 +166,19 @@ sh_mktmpfd (nameroot, flags, namep) + char *filename, *tdir, *lroot; + int fd, tdlen; + +- filename = (char *)xmalloc (PATH_MAX + 1); ++ filename = NULL; + tdir = get_tmpdir (flags); + tdlen = strlen (tdir); + + lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; + + #ifdef USE_MKSTEMP +- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); ++ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) ++ { ++ if (namep) ++ *namep = NULL; ++ return -1; ++ } + fd = mkstemp (filename); + if (fd < 0 || namep == 0) + { +@@ -187,7 +195,13 @@ sh_mktmpfd (nameroot, flags, namep) + (unsigned long) time ((time_t *)0) ^ + (unsigned long) dollar_dollar_pid ^ + (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++); +- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); ++ free (filename); ++ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) ++ { ++ if (namep) ++ *namep = NULL; ++ return -1; ++ } + if (tmpnamelen > 0 && tmpnamelen < 32) + filename[tdlen + 1 + tmpnamelen] = '\0'; + fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600); +--- mksyntax.c 2012-07-29 17:48:38.000000000 -0600 ++++ mksyntax.c 2015-02-06 17:14:11.062454900 -0700 +@@ -29,13 +29,13 @@ + + #ifdef HAVE_UNISTD_H + # include ++#else ++extern int optind; ++extern char *optarg; + #endif + + #include "syntax.h" + +-extern int optind; +-extern char *optarg; +- + #ifndef errno + extern int errno; + #endif +--- parse.y 2015-02-06 17:12:55.682776800 -0700 ++++ parse.y 2015-02-06 17:14:11.062454900 -0700 +@@ -1531,14 +1531,20 @@ yy_string_get () + string = bash_input.location.string; + + /* If the string doesn't exist, or is empty, EOF found. */ +- if (string && *string) ++ while (string && *string) + { + c = *string++; + bash_input.location.string = string; ++#if __CYGWIN__ ++ { ++ extern int igncr; ++ if (igncr && c == '\r') ++ continue; ++ } ++#endif + return (c); + } +- else +- return (EOF); ++ return (EOF); + } + + static int +@@ -2305,7 +2311,7 @@ shell_getc (remove_quoted_newline) + if (n <= 2) /* we have to save 1 for the newline added below */ + { + if (truncating == 0) +- internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%llu): line truncated", shell_input_line_size, SIZE_MAX); ++ internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%zu): line truncated", shell_input_line_size, SIZE_MAX); + shell_input_line[i] = '\0'; + truncating = 1; + } +@@ -3582,7 +3588,6 @@ parse_comsub (qc, open, close, lenp, fla + + while (count) + { +-comsub_readchar: + ch = shell_getc (qc != '\'' && (tflags & (LEX_INCOMMENT|LEX_PASSNEXT)) == 0); + + if (ch == EOF) +--- pathexp.h 2009-01-04 12:32:40.000000000 -0700 ++++ pathexp.h 2015-02-06 17:14:11.062454900 -0700 +@@ -86,7 +86,7 @@ struct ign { + typedef int sh_iv_item_func_t __P((struct ign *)); + + struct ignorevar { +- char *varname; /* FIGNORE or GLOBIGNORE */ ++ char *varname; /* FIGNORE or GLOBIGNORE or EXECIGNORE */ + struct ign *ignores; /* Store the ignore strings here */ + int num_ignores; /* How many are there? */ + char *last_ignoreval; /* Last value of variable - cached for speed */ +--- redir.c 2013-10-14 07:19:59.000000000 -0600 ++++ redir.c 2015-02-06 17:14:11.078059300 -0700 +@@ -156,7 +156,6 @@ redirection_error (temp, error) + #endif + else if (expandable_redirection_filename (temp)) + { +-expandable_filename: + oflags = temp->redirectee.filename->flags; + if (posixly_correct && interactive_shell == 0) + temp->redirectee.filename->flags |= W_NOGLOB; +--- subst.c 2015-02-06 17:12:55.370841100 -0700 ++++ subst.c 2015-02-06 17:14:11.078059300 -0700 +@@ -41,6 +41,7 @@ + #include "posixstat.h" + #include "bashintl.h" + ++#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */ + #include "shell.h" + #include "parser.h" + #include "flags.h" +@@ -5268,6 +5269,13 @@ read_comsub (fd, quoted, rflag) + #endif + continue; + } ++#if __CYGWIN__ ++ { ++ extern int igncr; ++ if (igncr && c == '\r') ++ continue; ++ } ++#endif /* __CYGWIN__ */ + + /* Add the character to ISTRING, possibly after resizing it. */ + RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE); +@@ -5385,6 +5393,28 @@ command_substitute (string, quoted) + goto error_exit; + } + ++#if __CYGWIN__ ++ /* Passing a pipe through std fds can cause hangs when talking to a ++ non-cygwin child. Move it. */ ++ if (fildes[0] < 3) ++ { ++ int fd = fcntl (fildes[0], F_DUPFD, 3); ++ close (fildes[0]); ++ fildes[0] = fd; ++ } ++ if (fildes[1] < 3) ++ { ++ int fd = fcntl (fildes[1], F_DUPFD, 3); ++ close (fildes[1]); ++ fildes[1] = fd; ++ } ++ if (fildes[0] < 0 || fildes[1] < 0) ++ { ++ sys_error (_("cannot make pipe for command substitution")); ++ goto error_exit; ++ } ++#endif /* __CYGWIN__ */ ++ + old_pid = last_made_pid; + #if defined (JOB_CONTROL) + old_pipeline_pgrp = pipeline_pgrp; +--- support/bashversion.c 2008-09-09 07:31:53.000000000 -0600 ++++ support/bashversion.c 2015-02-06 17:14:11.078059300 -0700 +@@ -26,6 +26,9 @@ + + #if defined (HAVE_UNISTD_H) + # include ++#else ++extern int optind; ++extern char *optarg; + #endif + + #include "bashansi.h" +@@ -41,9 +44,6 @@ + #define LFLAG 0x0020 + #define XFLAG 0x0040 + +-extern int optind; +-extern char *optarg; +- + extern char *dist_version; + extern int patch_level; + +@@ -65,7 +65,7 @@ main (argc, argv) + char **argv; + { + int opt, oflags; +- char dv[128], *rv; ++ char dv[128], *rv = NULL; + + if (progname = strrchr (argv[0], '/')) + progname++; +--- support/mkversion.sh 2008-08-13 06:25:57.000000000 -0600 ++++ support/mkversion.sh 2015-02-06 17:14:11.078059300 -0700 +@@ -29,7 +29,7 @@ source_dir="." + while [ $# -gt 0 ]; do + case "$1" in + -o) shift; OUTFILE=$1; shift ;; +- -b) shift; inc_build=yes ;; ++ -b) shift; ;;# inc_build=yes ;; # hacked out for cygport + -s) shift; rel_status=$1; shift ;; + -p) shift; patch_level=$1; shift ;; + -d) shift; dist_version=$1; shift ;; +--- variables.c 2015-02-06 17:12:55.729569600 -0700 ++++ variables.c 2015-02-06 17:14:11.078059300 -0700 +@@ -2526,9 +2526,9 @@ bind_variable_internal (name, value, tab + + newname = 0; + #if defined (ARRAY_VARS) +- if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name)) ++ if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference ((char *)name)) + { +- newname = array_variable_name (name, &subp, &sublen); ++ newname = array_variable_name ((char*)name, &subp, &sublen); + if (newname == 0) + return (SHELL_VAR *)NULL; /* XXX */ + entry = hash_lookup (newname, table); +@@ -2573,13 +2573,13 @@ bind_variable_internal (name, value, tab + entry = make_new_array_variable (newname); /* indexed array by default */ + if (entry == 0) + return entry; +- ind = array_expand_index (name, subp, sublen); ++ ind = array_expand_index (entry, subp, sublen); + bind_array_element (entry, ind, value, aflags); + } + #endif + else if (entry == 0) + { +- entry = make_new_variable (name, table); ++ entry = make_new_variable ((char*)name, table); + var_setvalue (entry, make_variable_value (entry, value, 0)); /* XXX */ + } + else if (entry->assign_func) /* array vars have assign functions now */ +@@ -4679,6 +4679,8 @@ static struct name_and_function special_ + { "COMP_WORDBREAKS", sv_comp_wordbreaks }, + #endif + ++ { "EXECIGNORE", sv_execignore }, ++ + { "FUNCNEST", sv_funcnest }, + + { "GLOBIGNORE", sv_globignore }, +@@ -4877,6 +4879,13 @@ sv_globignore (name) + setup_glob_ignore (name); + } + ++/* What to do when EXECIGNORE changes. */ ++void ++sv_execignore (char *name) ++{ ++ setup_exec_ignore (name); ++} ++ + #if defined (READLINE) + void + sv_comp_wordbreaks (name) +@@ -4950,7 +4959,7 @@ sv_winsize (name) + /* Update the value of HOME in the export environment so tilde expansion will + work on cygwin. */ + #if defined (__CYGWIN__) +-sv_home (name) ++void sv_home (name) + char *name; + { + array_needs_making = 1; +--- variables.h 2014-01-08 13:33:29.000000000 -0700 ++++ variables.h 2015-02-06 17:14:11.078059300 -0700 +@@ -372,6 +372,7 @@ extern void sv_ifs __P((char *)); + extern void sv_path __P((char *)); + extern void sv_mail __P((char *)); + extern void sv_funcnest __P((char *)); ++extern void sv_execignore __P((char *)); + extern void sv_globignore __P((char *)); + extern void sv_ignoreeof __P((char *)); + extern void sv_strict_posix __P((char *)); diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 8774db33b5ab..014a3ad4a2c3 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -3,21 +3,11 @@ assert interactive -> readline != null; let - version = if stdenv.isCygwin then "4.1" else "4.3"; + version = "4.3"; realName = "bash-${version}"; - shortName = if stdenv.isCygwin then "bash41" else "bash43"; + shortName = "bash43"; baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; - sha256 = if version == "4.1" then - "1np1ggp1lv8idwfx3mcxl9rhadqdf4h3x4isa3dk8v9wm0j72qiz" - else - "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; - - basePatchFun = if version == "4.1" then - ./bash-4.1-patches.nix - else - ./bash-4.3-patches.nix; - - extraPatches = stdenv.lib.optional stdenv.isCygwin ./bash-4.1.17-9.src.patch; + sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; in stdenv.mkDerivation rec { @@ -47,11 +37,19 @@ stdenv.mkDerivation rec { inherit sha256; }; in - import basePatchFun patch) ++ extraPatches; + import ./bash-4.3-patches.nix patch) + ++ stdenv.lib.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"; + " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" + + stdenv.lib.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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 115afe2c3bb5..6c675ec15235 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3392,6 +3392,7 @@ let bash = lowPrio (callPackage ../shells/bash { texinfo = null; + interactive = stdenv.isCygwin; # patch for cygwin requires readline support }); bashInteractive = appendToName "interactive" (callPackage ../shells/bash { From c7ac0ed3ebf3a270e5e32659c65f8a88d6deccb5 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 28 May 2015 13:55:55 -0700 Subject: [PATCH 088/127] Add Debian 8.0 Had to add file type logic in debClosureGenerator because Packages.bz2 is not available for Jessie - only Packages.xz is. --- pkgs/build-support/vm/default.nix | 33 ++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b96ac19177a4..22782adc9e9d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -694,7 +694,17 @@ rec { runCommand "${name}.nix" { buildInputs = [ perl dpkg ]; } '' for i in ${toString packagesLists}; do echo "adding $i..." - bunzip2 < $i >> ./Packages + case $i in + *.xz | *.lzma) + xz -d < $i >> ./Packages + ;; + *.bz2) + bunzip2 < $i >> ./Packages + ;; + *.gz) + gzip -dc < $i >> ./Packages + ;; + esac done # Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279 @@ -1698,6 +1708,27 @@ rec { packages = commonDebianPackages; }; + debian8i386 = { + name = "debian-8.0-jessie-i386"; + fullName = "Debian 8.0 Jessie (i386)"; + packagesList = fetchurl { + url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; + sha256 = "0lrv1lnd595c346ci7z8ja2b0rm2gx5r4hwp0wbp9lzxi8k5nk1d"; + }; + urlPrefix = mirror://debian; + packages = commonDebianPackages; + }; + + debian8x86_64 = { + name = "debian-8.0-jessie-amd64"; + fullName = "Debian 8.0 Jessie (amd64)"; + packagesList = fetchurl { + url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.xz; + sha256 = "0hhagvybciy89wr1cy9dgdfki668dvcywgbz4w01qwivyd6dsia4"; + }; + urlPrefix = mirror://debian; + packages = commonDebianPackages; + }; }; From 1db5bafc94abd0807b5f8bc1f59951cef073e70b Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 29 May 2015 02:08:25 -0700 Subject: [PATCH 089/127] Typo fix! s/wheezy/jessie/ --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 22782adc9e9d..a9f9f0d184cf 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1723,7 +1723,7 @@ rec { name = "debian-8.0-jessie-amd64"; fullName = "Debian 8.0 Jessie (amd64)"; packagesList = fetchurl { - url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.xz; + url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; sha256 = "0hhagvybciy89wr1cy9dgdfki668dvcywgbz4w01qwivyd6dsia4"; }; urlPrefix = mirror://debian; From dfbef0d7703c59af4713151a95d6f23fb2204136 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 28 May 2015 21:53:27 +0200 Subject: [PATCH 090/127] coq-coqeal: fix installation --- pkgs/development/coq-modules/coqeal/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index bfe83a74aae7..a9e69184c4e8 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, coq, ssreflect, mathcomp}: +{ stdenv, fetchgit, coq, mathcomp }: stdenv.mkDerivation rec { @@ -11,10 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1cvjz0yyqihdx1hp1h9x5x14kv9qf3rjhgqq4f7rv8bxcv9p1gv3"; }; - buildInputs = [ coq.ocaml coq.camlp5 ssreflect mathcomp ]; - propagatedBuildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; - preConfigure = "cd theory"; + preConfigure = '' + cd theory + patch ./Make < -R . CoqEAL + EOF + ''; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; From e999716d1ef25fb0927512117af8d8f32f275fe8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 29 May 2015 12:57:07 +0200 Subject: [PATCH 091/127] calibre: update from 2.28.0 to 2.29.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index fc013e9125fc..0e821e92703f 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.28.0"; + name = "calibre-2.29.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "15sb74v0nlj45fhlnw1afll35l90cxw78s15fb2nx3fih7ahv3cf"; + sha256 = "1n3cfnjnghhhsgzcbcvbr0gh191lhl6az09q1s68jhlcc2lski6l"; }; inherit python; From 27ffee363163f710bf526a7853c4dd2a475fe580 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 29 May 2015 13:14:44 +0200 Subject: [PATCH 092/127] owncloud: update from 7.0.4 to 7.0.5 (fixes CVE-2015-3012 and CVE-2014-9716) --- pkgs/servers/owncloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index ef01a3976bcc..449eee556c1c 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name= "owncloud-${version}"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { url = "https://download.owncloud.org/community/${name}.tar.bz2"; - sha256 = "0djgqdyxkrh1wc4sn21fmdjr09dkmnjm3gs6lbkp6yn5fpbzhybi"; + sha256 = "1j21b7ljvbhni9l0b1cpzlhsjy36scyas1l1j222mqdg2srfsi9y"; }; installPhase = From 859ec9719b17654c29df2074832794f8e3076247 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 6 May 2015 02:08:11 +0200 Subject: [PATCH 093/127] guitarix: use system zita libs --- pkgs/applications/audio/guitarix/default.nix | 6 ++-- .../audio/zita-resampler/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/audio/zita-resampler/default.nix diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 984d666ab952..9c1859cacf4e 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python , avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, jack2 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom +, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -22,15 +23,14 @@ stdenv.mkDerivation rec { buildInputs = [ avahi bluez boost eigen fftw glib glibmm gtk gtkmm jack2 ladspaH librdf libsndfile lilv lv2 serd sord sratom + zita-convolver zita-resampler ]; configureFlags = [ "--shared-lib" "--no-desktop-update" - "--no-faust" # Need to package a release of faust, 0.9.58 or 0.9.65 "--enable-nls" - "--includeresampler" # Zita-resampler not packaged, use vendored version - "--includeconvolver" # Zita-convolver not packaged, use vendored version + "--no-faust" # todo: find out why --faust doesn't work ] ++ optional optimizationSupport "--optimization"; configurePhase = ''python waf configure --prefix=$out $configureFlags''; diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix new file mode 100644 index 000000000000..8c7e82557ab5 --- /dev/null +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "zita-resampler-${version}"; + version = "1.3.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq"; + }; + + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=" + ]; + + patchPhase = '' + cd libs + sed -e "s@ldconfig@@" -i Makefile + ''; + + fixupPhase = '' + ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1 + ''; + + meta = { + description = "resample library by Fons Adriaensen"; + version = "${version}"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c675ec15235..65773332d051 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8240,6 +8240,8 @@ let zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { }; + zita-resampler = callPackage ../development/libraries/audio/zita-resampler { }; + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / AGDA From 0ff8e28b83c50f723c7fffc75ea7ba83ee072cca Mon Sep 17 00:00:00 2001 From: codyopel Date: Fri, 29 May 2015 08:53:41 -0400 Subject: [PATCH 094/127] tetraproc: add missing Xorg libs & ensure Jack is in PATH --- pkgs/applications/audio/tetraproc/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index b1356d3c5474..309a400c555f 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, fftwFloat, freetype, jack2, libclthreads, libclxclient, libsndfile, x11 }: +{ stdenv, fetchurl, makeWrapper +, expat, fftwFloat, fontconfig, freetype, jack2, libclthreads, libclxclient +, libsndfile, libxcb, xlibs +}: stdenv.mkDerivation rec { name = "tetraproc-${version}"; @@ -9,7 +12,12 @@ stdenv.mkDerivation rec { sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv"; }; - buildInputs = [ jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11 ]; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + expat jack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype + libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender + ]; makeFlags = [ "PREFIX=$(out)" @@ -20,6 +28,11 @@ stdenv.mkDerivation rec { cd ./source/ ''; + postInstall = '' + # Make sure Jack is avalable in $PATH for tetraproc + wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin" + ''; + meta = with stdenv.lib; { description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording"; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/; From 0c5a7d5df2c5b23c5ca401825545b6b15a777b33 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 May 2015 09:41:28 -0400 Subject: [PATCH 095/127] nix-exec: build against nixUnstable --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c675ec15235..2564a9780073 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4780,6 +4780,8 @@ let nix-exec = callPackage ../development/interpreters/nix-exec { git = gitMinimal; + + nix = nixUnstable; }; octave = callPackage ../development/interpreters/octave { From 1b93d6416872fd88bb96cc57d2a03e0b850138c6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 May 2015 11:05:36 -0400 Subject: [PATCH 096/127] nix-exec: bump --- pkgs/development/interpreters/nix-exec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 6e7ffa656a06..92df954e5e01 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let - version = "4.0.0"; + version = "4.1.0"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "0qw25v8pzx08mirhy46dmqj93nwnxfvgw2jsn8rvxh2d7x4nc8jv"; + sha256 = "16hssxv6fwi5a6bz7dlvhjjr3ymiqrvq0xfd38gwhn9qhvynv2ak"; }; buildInputs = [ pkgconfig nix git ]; From eb0a21a51208927730607fd9166912d3f8e05435 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 May 2015 11:21:49 -0400 Subject: [PATCH 097/127] boto: Remove obsolete patch --- .../python-modules/boto/content-length-str.patch | 16 ---------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/python-modules/boto/content-length-str.patch diff --git a/pkgs/development/python-modules/boto/content-length-str.patch b/pkgs/development/python-modules/boto/content-length-str.patch deleted file mode 100644 index 7895e223c6b5..000000000000 --- a/pkgs/development/python-modules/boto/content-length-str.patch +++ /dev/null @@ -1,16 +0,0 @@ -Cherry-picked from https://github.com/boto/boto/pull/2932 - -This fix is required for things like docker-registry to interact with S3. Will -be obsolete after the next boto release (> 2.36.0) - ---- a/boto/connection.py -+++ b/boto/connection.py -@@ -381,7 +381,7 @@ class HTTPRequest(object): - if 'Content-Length' not in self.headers: - if 'Transfer-Encoding' not in self.headers or \ - self.headers['Transfer-Encoding'] != 'chunked': -- self.headers['Content-Length'] = len(self.body) -+ self.headers['Content-Length'] = str(len(self.body)) - - - class HTTPResponse(http_client.HTTPResponse): diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7f69d5c6548..78ae505f1ff8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1308,8 +1308,6 @@ let buildInputs = [ self.nose self.mock ]; propagatedBuildInputs = [ self.requests self.httpretty ]; - patches = [ ../development/python-modules/boto/content-length-str.patch ]; - meta = { homepage = https://github.com/boto/boto; From 0ad7204c3d7bf2423a65f6eef164d6a2df1642d6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 May 2015 13:05:48 -0400 Subject: [PATCH 098/127] nixopsUnstable: bump --- pkgs/tools/package-management/nixops/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 17532039d913..3400d72dea84 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -17,13 +17,13 @@ let in pythonPackages.buildPythonPackage rec { - name = "nixops-1.3pre1362_2a616f8"; + name = "nixops-1.3pre1484_a932a9e"; namePrefix = ""; src = fetchgit { url = https://github.com/NixOS/nixops; - rev = "2a616f8ddc18800c9e1c7013632078a55c06c3e3"; - sha256 = "12arppri2j9sblja73jlfdcbpz1z94cd35n9ypazcsw4irmya3k6"; + rev = "a932a9ecec15336a55f2aa2c2a20f08264adb837"; + sha256 = "010qqpa4yvsra1744afsaj9akqjxzla5p0i4zgan9306m8k3jnpk"; }; buildInputs = [ pythonPackages.nose pythonPackages.coverage ]; From 86e6e490ff324c6f5368aab24453ce2edfc39741 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 29 May 2015 19:07:20 +0200 Subject: [PATCH 099/127] nzbget: update from 14.2 to 15.0 --- pkgs/tools/networking/nzbget/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 13bd3a87845b..8d47ab1e167f 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2 -, gnutls, libgcrypt }: +, gnutls, libgcrypt, zlib }: stdenv.mkDerivation rec { - name = "nzbget-14.2"; + name = "nzbget-15.0"; src = fetchurl { url = "mirror://sourceforge/nzbget/${name}.tar.gz"; - sha256 = "0xs620hjxi9fkab6bmgy7zhwd0h035jpabf0wp2nc5y0gnsay95v"; + sha256 = "02nclq97gqr4zwww4j1l9sds2rwrwwvwvh2gkjhwvr0pb4z3zw9y"; }; - buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ]; + buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls + libgcrypt zlib ]; enableParallelBuilding = true; - NIX_LDFLAGS = "-lz"; - meta = with stdenv.lib; { homepage = http://nzbget.sourceforge.net/; license = licenses.gpl2Plus; From a74e4863f351e4cd2e0ec487b24cb3d1a91ccb9d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 10:12:00 -0700 Subject: [PATCH 100/127] krb5: Fixes --- pkgs/development/libraries/kerberos/krb5.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index c60ff03aa67a..6d3d8eec58f7 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -3,7 +3,7 @@ # Optional Dependencies , libedit ? null, readline ? null, ncurses ? null, libverto ? null -, openldap ? null, db ? null +, openldap ? null # Crypto Dependencies , openssl ? null, nss ? null, nspr ? null @@ -24,7 +24,6 @@ let optNcurses = if libOnly then null else shouldUsePkg ncurses; optLibverto = shouldUsePkg libverto; optOpenldap = if libOnly then null else shouldUsePkg openldap; - optDb = if libOnly then null else shouldUsePkg db; # Prefer the openssl implementation cryptoStr = if optOpenssl != null then "openssl" @@ -94,7 +93,7 @@ stdenv.mkDerivation rec { (mkWith (optLibverto != null) "system-verto" null) (mkWith (optOpenldap != null) "ldap" null) (mkWith false "tcl" null) - (mkWith (optDb != null) "system-db" null) + (mkWith false "system-db" null) # Requires db v1.85 ]; buildPhase = optionalString libOnly '' @@ -106,11 +105,14 @@ stdenv.mkDerivation rec { installPhase = optionalString libOnly '' mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}} + (cd util; make install) (cd include; make install) (cd lib; make install) (cd build-tools; make install) - rm -rf $out/{bin,sbin,share} + + rm -rf $out/{sbin,share} + find $out/bin -type f | grep -v 'krb5-config' | xargs rm ''; enableParallelBuilding = true; From ac2f05a50ae5113cbdd7e66599ff54b728ae10e4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 00:40:04 -0700 Subject: [PATCH 101/127] krb5: Make lib build parallel --- pkgs/development/libraries/kerberos/krb5.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 6d3d8eec58f7..c4974c51e81a 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -97,19 +97,19 @@ stdenv.mkDerivation rec { ]; buildPhase = optionalString libOnly '' - (cd util; make) - (cd include; make) - (cd lib; make) - (cd build-tools; make) + (cd util; make -j $NIX_BUILD_CORES) + (cd include; make -j $NIX_BUILD_CORES) + (cd lib; make -j $NIX_BUILD_CORES) + (cd build-tools; make -j $NIX_BUILD_CORES) ''; installPhase = optionalString libOnly '' mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}} - (cd util; make install) - (cd include; make install) - (cd lib; make install) - (cd build-tools; make install) + (cd util; make -j $NIX_BUILD_CORES install) + (cd include; make -j $NIX_BUILD_CORES install) + (cd lib; make -j $NIX_BUILD_CORES install) + (cd build-tools; make -j $NIX_BUILD_CORES install) rm -rf $out/{sbin,share} find $out/bin -type f | grep -v 'krb5-config' | xargs rm From 9f0da5315b4595c45ace01727808e2ae8750efc0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 May 2015 20:31:22 -0700 Subject: [PATCH 102/127] Fix krb5 reference --- pkgs/servers/ldap/389/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 685d365ed185..33d63f6ee03e 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl -, svrcore, icu, net_snmp, kerberos, pcre, perlPackages +, svrcore, icu, net_snmp, libkrb5, pcre, perlPackages }: let version = "1.3.3.9"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu - net_snmp kerberos pcre + net_snmp libkrb5 pcre ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2564a9780073..fe37c734581d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8553,7 +8553,7 @@ let ### SERVERS "389-ds-base" = callPackage ../servers/ldap/389 { - kerberos = krb5; + kerberos = libkrb5; }; rdf4store = callPackage ../servers/http/4store { }; From b1e4371a1cb5b8aa45ee3cd8b5ba5537f60d53b0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 10:26:25 -0700 Subject: [PATCH 103/127] 389-ds-base: Remove kerberos line as it is strictly dependent on krb5 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe37c734581d..b55ab8ae9274 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8552,9 +8552,7 @@ let ### SERVERS - "389-ds-base" = callPackage ../servers/ldap/389 { - kerberos = libkrb5; - }; + "389-ds-base" = callPackage ../servers/ldap/389 { }; rdf4store = callPackage ../servers/http/4store { }; From 7e126ac83ee1689df4d22bb4ad9c4163acc734a0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 26 May 2015 17:51:10 -0700 Subject: [PATCH 104/127] audit: 2.9.1 -> 2.9.2 --- pkgs/os-specific/linux/audit/default.nix | 58 ++++++++++++++----- .../os-specific/linux/libsemanage/default.nix | 4 +- pkgs/top-level/all-packages.nix | 8 ++- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 05b9eb9e56fa..8365017d13b7 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,29 +1,61 @@ -{ stdenv, fetchurl, openldap -, enablePython ? false, python ? null +{ stdenv, fetchurl +, libcap_ng + +# Optional Dependencies +, openldap ? null, python ? null, go ? null, krb5 ? null, tcp_wrappers ? null + +# Extra arguments +, prefix ? "" }: -assert enablePython -> python != null; +with stdenv; +let + libOnly = prefix == "lib"; + optOpenldap = if libOnly then null else shouldUsePkg openldap; + optPython = shouldUsePkg python; + optGo = shouldUsePkg go; + optKrb5 = if libOnly then null else shouldUsePkg krb5; + optTcp_wrappers = if libOnly then null else shouldUsePkg tcp_wrappers; +in +with stdenv.lib; stdenv.mkDerivation rec { - name = "audit-2.4.1"; + name = "${prefix}audit-${version}"; + version = "2.4.2"; src = fetchurl { - url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "09ihn392pmac1pyjrs22966csia83yr84hq5ri6sybwj1vx4d4q5"; + url = "http://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz"; + sha256 = "08j134s4509rxfi3hwsp8yyxzlqqxl8kqgv2rfv6p3qng5pjd80j"; }; - buildInputs = [ openldap ] - ++ stdenv.lib.optional enablePython python; + buildInputs = [ libcap_ng optOpenldap optPython optGo optKrb5 optTcp_wrappers ]; - configureFlags = '' - ${if enablePython then "--with-python" else "--without-python"} + # For libs only build and install the lib portion + preBuild = optionalString libOnly '' + cd lib ''; + configureFlags = [ + (mkWith (optPython != null) "python" null) + (mkWith (optGo != null) "golang" null) + (mkEnable (!libOnly) "listener" null) + (mkEnable (optKrb5 != null) "gssapi-krb5" null) + (mkEnable false "systemd" null) + (mkWith false "debug" null) + (mkWith false "warn" null) + (mkWith false "alpha" null) # TODO: Support + (mkWith false "arm" null) # TODO: Support + (mkWith false "aarch64" null) # TODO: Support + (mkWith (!libOnly) "apparmor" null) + (mkWith false "prelude" null) + (mkWith (optTcp_wrappers != null) "libwrap" optTcp_wrappers) + ]; + meta = { description = "Audit Library"; homepage = "http://people.redhat.com/sgrubb/audit/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ fuuzetsu wkennington ]; }; } diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 599da9e4b3c2..fbb4be532115 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, audit }: +{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, libaudit }: stdenv.mkDerivation rec { name = "libsemanage-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fstack-protector-all"; NIX_CFLAGS_LINK = "-lsepol"; - buildInputs = [ libsepol libselinux ustr bzip2 bison flex audit ]; + buildInputs = [ libsepol libselinux ustr bzip2 bison flex libaudit ]; meta = with stdenv.lib; { inherit (libsepol.meta) homepage platforms maintainers; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b55ab8ae9274..f68a7cd61370 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9177,7 +9177,13 @@ let atop = callPackage ../os-specific/linux/atop { }; - audit = callPackage ../os-specific/linux/audit { }; + audit = callPackage ../os-specific/linux/audit { + python = null; + go = null; + }; + libaudit = audit.override { + prefix = "lib"; + }; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; From 023f0f79922eef4301f95cdd2d25f4de3c018b35 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 May 2015 20:30:51 -0700 Subject: [PATCH 105/127] ceph: 0.94.1.1 -> 0.94.1.2 --- pkgs/tools/filesystems/ceph/0.94.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix index b8d87506b7e5..90c23665508c 100644 --- a/pkgs/tools/filesystems/ceph/0.94.nix +++ b/pkgs/tools/filesystems/ceph/0.94.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.94.1.1"; + version = "0.94.1.2"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "1qvjj2iqzv2xz5037ksbk7mqjv6gsx2jsprizdzzzij3hnlricp5"; + sha256 = "0ks5djgfhjpydjdlw7s940m3mlzrvz0xhhk75nqx7sbvymgcc73q"; }; patches = [ ./fix-pgrefdebugging.patch ]; From d7ebe7a4f3e3d1f4fdd450f8f80a005e6d80e8c5 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 29 May 2015 19:35:31 +0200 Subject: [PATCH 106/127] buildRustPackage: Accept `srcs` attribute as well Add support for building Rust packages that have multiple sources, i.e., that use the `srcs` and `sourceRoot` attributes instead of just `src`. --- pkgs/build-support/rust/default.nix | 10 ++++++++-- pkgs/build-support/rust/fetch-builder.sh | 17 ----------------- pkgs/build-support/rust/fetchcargo.nix | 12 ++++++++---- 3 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 pkgs/build-support/rust/fetch-builder.sh diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 87115e392daf..cd19782e6115 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,5 +1,11 @@ { stdenv, cacert, git, rustc, cargo, rustRegistry }: -{ name, src, depsSha256, buildInputs ? [], cargoUpdateHook ? "", ... } @ args: +{ name, depsSha256 +, src ? null +, srcs ? null +, sourceRoot ? null +, buildInputs ? [] +, cargoUpdateHook ? "" +, ... } @ args: let fetchDeps = import ./fetchcargo.nix { @@ -7,7 +13,7 @@ let }; cargoDeps = fetchDeps { - inherit name src cargoUpdateHook; + inherit name src srcs sourceRoot cargoUpdateHook; sha256 = depsSha256; }; diff --git a/pkgs/build-support/rust/fetch-builder.sh b/pkgs/build-support/rust/fetch-builder.sh deleted file mode 100644 index faa17e653289..000000000000 --- a/pkgs/build-support/rust/fetch-builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -# cargo-fetch needs to write to Cargo.lock, even to do nothing. We -# create a fake checkout with symlinks and and editable Cargo.lock. -mkdir copy -cd copy -for f in $(ls $src); do - ln -s $src/"$f" . -done -rm Cargo.lock -cp $src/Cargo.lock . -chmod +w Cargo.lock - -$fetcher . $out - -cd .. -rm -rf copy diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 7ebd02a485d7..575df64c6b29 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,12 +1,16 @@ { stdenv, cacert, git, rustc, cargo, rustRegistry }: -{ name ? "cargo-deps", src, sha256, cargoUpdateHook ? "" }: +{ name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-fetch"; buildInputs = [ rustc cargo git ]; - builder = ./fetch-builder.sh; - fetcher = ./fetch-cargo-deps; - inherit src rustRegistry cargoUpdateHook; + inherit src srcs sourceRoot rustRegistry cargoUpdateHook; + + phases = "unpackPhase installPhase"; + + installPhase = '' + ${./fetch-cargo-deps} . "$out" + ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; From b59d52daf723d4d99330a05cf7c39fdc0b9fca7d Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 29 May 2015 19:49:28 +0200 Subject: [PATCH 107/127] grsecurity: Update stable and test patches stable: 3.1-3.14.43-201505222221 -> 3.1-3.14.43-201505272112 test: 3.1-4.0.4-201505222222 -> 3.1-4.0.4-201505272113 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9072371d33cc..000dfbd21c57 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,16 +66,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.43"; - revision = "201505222221"; + revision = "201505272112"; branch = "stable"; - sha256 = "1qmlcp1lg9c56p0fx6ancavxqxpvkh6h8fpxnr2ks35s4wln5y7x"; + sha256 = "06zwwzrqp59rkv5pi75iskznnlnmc6hsc91dqxymfgd533sbpxp9"; }; grsecurity_unstable = grsecPatch { kversion = "4.0.4"; - revision = "201505222222"; + revision = "201505272113"; branch = "test"; - sha256 = "0ampby10y3kr36f7rvzm5fdk9f2gcfmcdgkzf67b5kj78y52ypfz"; + sha256 = "1aa8qc4g68ybdjc4gb1p0rk1m2bqhj8a5iz6cica6lrr54lda9hx"; }; grsec_fix_path = From 2927efe62e02f3a397b105c7c7d7ae77f43d4d01 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 29 May 2015 19:50:09 +0200 Subject: [PATCH 108/127] cabextract: update from 1.4 to 1.6 --- pkgs/tools/archivers/cabextract/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 79be818bfb39..7a1eec92bbeb 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cabextract-1.4"; + name = "cabextract-1.6"; src = fetchurl { url = "http://www.cabextract.org.uk/${name}.tar.gz"; - sha256 = "07p49053a727nwnw7vnx1bpj4xqa43cvx8mads2146fpqai8pfpp"; + sha256 = "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.cabextract.org.uk/; description = "Free Software for extracting Microsoft cabinet files"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; }; } From ce62e1c77f3896bbf827b38204797f5a72f3c9fa Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 28 May 2015 10:04:51 -0400 Subject: [PATCH 109/127] youtube-dl: refactor Closes https://github.com/NixOS/nixpkgs/pull/8039. --- pkgs/tools/misc/youtube-dl/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 14d6dccb041f..5171d5cec5aa 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }: -with stdenv.lib; stdenv.mkDerivation rec { name = "youtube-dl-${version}"; version = "2015.05.20"; @@ -10,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1crfada7vq3d24062wr06sfam66cf14j06wnhg7w5ljzrbynvpll"; }; - buildInputs = [ python makeWrapper zip pandoc ]; + nativeBuildInputs = [ pandoc ]; + + buildInputs = [ python makeWrapper zip ]; patchPhase = '' rm youtube-dl @@ -20,12 +21,12 @@ stdenv.mkDerivation rec { makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) ''; + # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. postInstall = '' - # ffmpeg is used for post-processing and fixups wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin" ''; - meta = { + meta = with stdenv.lib; { homepage = "http://rg3.github.com/youtube-dl/"; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; From f51d38214d55afae1e14a5e7875824267325f7f7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 11:48:20 -0700 Subject: [PATCH 110/127] nixUnstable: Bump --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 479915a9cee2..bfa23325b399 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.9pre4100_4bbcfaf"; + name = "nix-1.9pre4132_07c69aa"; src = fetchurl { - url = "http://hydra.nixos.org/build/21565942/download/4/${name}.tar.xz"; - sha256 = "1jcy0n8mi17k5vk89vammfh74lvsgnm4gjsk23cq1shspjnbbgxs"; + url = "http://hydra.nixos.org/build/22635534/download/4/${name}.tar.xz"; + sha256 = "adaf272b50fce0d8aec34b38b5b62cb3438eeb379f918f85f76f43a7314d23d6"; }; nativeBuildInputs = [ perl pkgconfig ]; From 84208c3d0001c9a3f5d79d7512a2eeec07fd0d47 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 29 May 2015 20:51:33 +0200 Subject: [PATCH 111/127] mysql55: update from 5.5.42 to 5.5.43 --- pkgs/servers/sql/mysql/5.5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 778e2f58eb7c..8469ae4e9480 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.42"; + version = "5.5.43"; src = fetchurl { url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz"; - sha256 = "0jn7py2wsq78rwi7vfihxs6z3h5hr338b9g46fl3z2g4ddki4yw8"; + sha256 = "1kbl8xp6xi9yclc4q0q97s89rr498mm0avpbkmsa4ff8wmwxzls3"; }; patches = if stdenv.isCygwin then [ From c8e59a41b0c9b7e775013820d1b15715218bb846 Mon Sep 17 00:00:00 2001 From: "Ryan Scheel (Havvy)" Date: Fri, 29 May 2015 21:03:05 +0200 Subject: [PATCH 112/127] Updated: io.js from v1.6.4 to v.2.1.0 Closes #9707 --- pkgs/development/web/iojs/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index fa9b680f2816..b3b9881559d8 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv }: +{ stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: let - version = "1.6.4"; + version = "2.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 = "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7"; + sha256 = "0v6jzsrq3ym0nqy7nb9chn8ij79agifwdvsp5nysgr609na7617i"; }; prePatch = '' @@ -17,7 +17,11 @@ in stdenv.mkDerivation { configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ]; - buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); + # 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_1_0_2 http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); setupHook = ../nodejs/setup-hook.sh; passthru.interpreterName = "iojs"; From 5273166f533a1050faee7f5301c8abb3a1982355 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 May 2015 15:16:40 -0400 Subject: [PATCH 113/127] Disable failing DBIxClass tests Seems to be random --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94a008637405..6a0072424879 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2565,6 +2565,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; + doCheck = false; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; From fd1fb0403c406d1c3aca07735bb247e0643bdb0d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 29 May 2015 19:36:16 +0000 Subject: [PATCH 114/127] Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config. --- nixos/modules/virtualisation/amazon-image.nix | 2 +- nixos/modules/virtualisation/azure-common.nix | 2 +- nixos/modules/virtualisation/google-compute-image.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 600a29f31bc5..dc92e4f609fb 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -170,7 +170,7 @@ in # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. - boot.loader.grub.configurationLimit = 0; + boot.loader.grub.configurationLimit = 1; # Allow root logins only using the SSH key that the user specified # at instance creation time. diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 47022c6887c3..a6368eb2c625 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -14,7 +14,7 @@ with lib; # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. - boot.loader.grub.configurationLimit = 0; + boot.loader.grub.configurationLimit = 1; fileSystems."/".device = "/dev/disk/by-label/nixos"; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index ee5485071a35..eea6c646d483 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -106,7 +106,7 @@ in # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. - boot.loader.grub.configurationLimit = 0; + boot.loader.grub.configurationLimit = 1; # Allow root logins only using the SSH key that the user specified # at instance creation time. From c9f5b8a2eecfb1fb11cfe0d2eab68b47f0502eb5 Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Fri, 29 May 2015 21:55:53 +0200 Subject: [PATCH 115/127] chuck: 1.3.5.0 -> 1.3.5.1 --- pkgs/applications/audio/chuck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index bbce758be8ae..04cc8008ea89 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }: stdenv.mkDerivation rec { - version = "1.3.5.0"; + version = "1.3.5.1"; name = "chuck-${version}"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "0rj2l5k6ncm4jaiq0igwfc2bzryzchk1is1jhk1n7wifxcf3d3k5"; + sha256 = "0lqzkphfd91kz95nf1wqy0z17r1m70c8inwvnb9fscbiaihwlhfi"; }; buildInputs = [ bison flex libsndfile which ] From e928a5379f4cefdaba455b16a2b9dfce03ee1e79 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 29 May 2015 20:55:59 +0200 Subject: [PATCH 116/127] ncdu: update from 1.10 to 1.11 --- pkgs/tools/misc/ncdu/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index ff751eb40da3..6ea9d71bddc7 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "http://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "0rqc5wpqcbfqpcwxgh3jxwa0yw2py0hv0acpsf0a9g6v9144m6gm"; + sha256 = "0yxv87hpal05p6nii6rlnai5a8958689l9vz020w4qvlwiragbnh"; }; buildInputs = [ ncurses ]; - meta = { + meta = with stdenv.lib; { description = "Ncurses disk usage analyzer"; homepage = http://dev.yorhel.nl/ncdu; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; }; } From c0a5ffc438b70598c868787723f55257032113f3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 29 May 2015 22:16:08 +0200 Subject: [PATCH 117/127] wireshark: update from 1.12.4 to 1.12.5, fixes CVE-2015-3808 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index f3215e7befd6..ac2d11a33f16 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "1.12.4"; + version = "1.12.5"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2"; - sha256 = "04n3xfakg6368ba49vj6n3csqnkzipac4sldsaavgr2jwac4x06y"; + sha256 = "10mxgj916bwv92pfhk4kldcaanr9vndjklzp9ypdxr29xyr7gwfh"; }; buildInputs = [ From d4f3930201895534ccaa9ce4c5411ffb3da9fc51 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 12:01:50 -0700 Subject: [PATCH 118/127] nixos/grub: Fix defaultConfig --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c790e05f51bd..1fb2e20949a0 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -354,7 +354,7 @@ in export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} '' + flip concatMapStrings cfg.mirroredBoots (args: '' - ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} + ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} $@ '')); system.build.grub = grub; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index a0384d23f821..3ca30b58023b 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -11,7 +11,7 @@ require List::Compare; use POSIX; use Cwd; -my $defaultConfig = $ARGV[0] or die; +my $defaultConfig = $ARGV[1] or die; my $dom = XML::LibXML->load_xml(location => $ARGV[0]); From 159fed47bcfab67d36d4959fb3ac952a7ad9128c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 12:09:08 -0700 Subject: [PATCH 119/127] nixos/grub: Fix video display on efi --- nixos/modules/system/boot/loader/grub/install-grub.pl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 3ca30b58023b..fcf5871203d5 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -254,10 +254,15 @@ else { set timeout=$timeout fi + # Setup the graphics stack for bios and efi systems + insmod vbe + insmod efi_gop + insmod efi_uga + insmod font if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then - set gfxmode=640x480 insmod gfxterm - insmod vbe + set gfxmode=auto + set gfxpayload=keep terminal_output gfxterm fi "; From 1e98da6d992522ae26bc37bb670b09805f44b762 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 12:14:05 -0700 Subject: [PATCH 120/127] nixos/grub: Use nixos artwork --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- .../loader/grub/winkler-gnu-blue-640x480.png | Bin 74487 -> 0 bytes .../boot/loader/grub/winkler-gnu-blue.README | 6 ------ 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png delete mode 100644 nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 1fb2e20949a0..22af11b484e9 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -337,7 +337,7 @@ in sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; } # GRUB 1.97 doesn't support gzipped XPMs. - else ./winkler-gnu-blue-640x480.png); + else "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"); } (mkIf cfg.enable { diff --git a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png deleted file mode 100644 index 35bbb57b51ee147cb3dc32747ee31d7fb3cba3bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 74487 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 MR!1UgRPDn41ItmTMgRZ+ diff --git a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README deleted file mode 100644 index 9616362dce2a..000000000000 --- a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README +++ /dev/null @@ -1,6 +0,0 @@ -This is a resized version of - - http://www.gnu.org/graphics/winkler-gnu-blue.png - -by Kyle Winkler and released under the Free Art License -(http://artlibre.org/licence.php/lalgb.html). From aa5d6922c559d15ec8a17eccb23c0f5a27160946 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 13:26:51 -0700 Subject: [PATCH 121/127] Revert "Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config." The issue was that grub was not building the default entry which would leave systems unbootable. This can now be safely reverted as the default entry is being built once again. This reverts commit fd1fb0403c406d1c3aca07735bb247e0643bdb0d. --- nixos/modules/virtualisation/amazon-image.nix | 2 +- nixos/modules/virtualisation/azure-common.nix | 2 +- nixos/modules/virtualisation/google-compute-image.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index dc92e4f609fb..600a29f31bc5 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -170,7 +170,7 @@ in # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. - boot.loader.grub.configurationLimit = 1; + boot.loader.grub.configurationLimit = 0; # Allow root logins only using the SSH key that the user specified # at instance creation time. diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index a6368eb2c625..47022c6887c3 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -14,7 +14,7 @@ with lib; # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. - boot.loader.grub.configurationLimit = 1; + boot.loader.grub.configurationLimit = 0; fileSystems."/".device = "/dev/disk/by-label/nixos"; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index eea6c646d483..ee5485071a35 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -106,7 +106,7 @@ in # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. - boot.loader.grub.configurationLimit = 1; + boot.loader.grub.configurationLimit = 0; # Allow root logins only using the SSH key that the user specified # at instance creation time. From d6cbb061e3bb5d2a93196a4543cfbd7c2359bd84 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 13:51:55 -0700 Subject: [PATCH 122/127] cacert: Build directly from nss instead of our own tarball --- nixos/modules/security/ca.nix | 4 ++-- pkgs/data/misc/cacert/default.nix | 32 ++++++++++++++++++------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index e60cb5cdb67d..595b9476fa5f 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -22,7 +22,7 @@ in security.pki.certificateFiles = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ \"\${pkgs.cacert}/etc/ca-bundle.crt\" ]"; + example = literalExample "[ \"\${pkgs.cacert}/ca-bundle.crt\" ]"; description = '' A list of files containing trusted root certificates in PEM format. These are concatenated to form @@ -53,7 +53,7 @@ in config = { - security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ca-bundle.crt" ]; + security.pki.certificateFiles = [ "${pkgs.cacert}/ca-bundle.crt" ]; # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility. environment.etc."ssl/certs/ca-certificates.crt".source = caBundle; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 0a2c43fc5812..205d051ddb29 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl }: +{ stdenv, nss, curl-full, perl, perlPackages }: stdenv.mkDerivation rec { - name = "cacert-20140715"; + name = "nss-cacert-${nss.version}"; - src = fetchurl { - url = "http://tarballs.nixos.org/${name}.pem.bz2"; - sha256 = "1l4j7z6ysnllx99isjzlc8zc34rbbgj4kzlg1y5sy9bgphc8cssl"; - }; + src = nss.src; - unpackPhase = "true"; + postPatch = '' + unpackFile ${curl-full.src}; + ''; - installPhase = - '' - mkdir -p $out/etc - bunzip2 < $src > $out/etc/ca-bundle.crt - ''; + nativeBuildInputs = [ perl ] ++ (with perlPackages; [ LWP ]); - meta = { + buildPhase = '' + perl curl-*/lib/mk-ca-bundle.pl -d "file://$(pwd)/nss/lib/ckfw/builtins/certdata.txt" ca-bundle.crt + ''; + + installPhase = '' + mkdir -pv $out + cp -v ca-bundle.crt $out + ''; + + meta = with stdenv.lib; { homepage = http://curl.haxx.se/docs/caextract.html; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From 14c1e0fa1f9eacf9b039662747d317f1afc24fea Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 14:03:34 -0700 Subject: [PATCH 123/127] Fix ca-bundle paths --- pkgs/applications/networking/cluster/panamax/api/default.nix | 4 ++-- .../networking/instant-messengers/fuze/default.nix | 2 +- pkgs/applications/networking/irc/weechat/default.nix | 2 +- pkgs/applications/version-management/bazaar/default.nix | 4 ++-- pkgs/build-support/fetchgit/default.nix | 2 +- pkgs/build-support/rust/fetchcargo.nix | 2 +- pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix | 4 ++-- pkgs/development/compilers/icedtea/default.nix | 2 +- pkgs/development/compilers/openjdk/default.nix | 2 +- pkgs/development/compilers/openjdk/openjdk8.nix | 2 +- pkgs/development/interpreters/elixir/default.nix | 2 +- pkgs/development/lisp-modules/lisp-packages.nix | 4 ++-- pkgs/tools/networking/aria2/default.nix | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 6cbec878a484..dae0315a31b2 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ --prefix "HOME" : "$out/share/panamax-api" \ --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \ - --prefix "SSL_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \ + --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/ca-bundle.crt" \ + --prefix "SSL_CERT_FILE" : "${cacert}/ca-bundle.crt" \ --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" ''; diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index bc9246d8845c..77fe37481d87 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let curl_custom = stdenv.lib.overrideDerivation curl (args: { - configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ca-bundle.crt"] ; + configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/ca-bundle.crt"] ; } ); in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index d5cc3fb7718f..bbad15879820 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cacert cmake ] ++ extraBuildInputs; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ca-bundle.crt"; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/ca-bundle.crt"; postInstall = '' NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 648d59ac01c2..ad6f0c50a379 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509"; }; - buildInputs = [ pythonPackages.python pythonPackages.wrapPython cacert ]; + buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; # Readline support is needed by bzrtools. pythonPath = [ pythonPackages.readline ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./add_certificates.patch ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ - --subst-var-by "certPath" "${cacert}/etc/ca-bundle.crt" + --subst-var-by "certPath" "${cacert}/ca-bundle.crt" ''; diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index e5ad7200cecf..7259fa8ff4c5 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { inherit url rev leaveDotGit fetchSubmodules deepClone branchName; - GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt"; + GIT_SSL_CAINFO = "${cacert}/ca-bundle.crt"; impureEnvVars = [ # We borrow these environment variables from the caller to allow diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 575df64c6b29..1f5166d5c434 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - SSL_CERT_FILE = "${cacert}/etc/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/ca-bundle.crt"; impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; preferLocalBuild = true; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix index aacc62a30a9c..7afa2800105f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper -, docbook_xsl_ns, docbook_xsl, gnome3 }: +, docbook_xsl_ns, docbook_xsl, gnome3, cacert }: let majVer = gnome3.version; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; configureFlags = [ - "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path + "--with-ca-certificates=${cacert}/ca-bundle.crt" # NixOS hardcoded path "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix index 5e008821d950..fe7ec5851557 100644 --- a/pkgs/development/compilers/icedtea/default.nix +++ b/pkgs/development/compilers/icedtea/default.nix @@ -135,7 +135,7 @@ let # Generate certificates. pushd $jre/lib/icedtea/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/ca-bundle.crt popd ln -s $out/lib/icedtea/bin $out/bin diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index ec095bb4efa3..d0ca85af0e0e 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -142,7 +142,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 63d42e6e3d64..b0dae2512a5b 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -134,7 +134,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 1166c7075c85..9d12d42cee88 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { if [ $b == "mix" ]; then continue; fi wrapProgram $f \ --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ - --set CURL_CA_BUNDLE "${cacert}/etc/ca-bundle.crt" + --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt" done ''; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 91c08419e706..910a082b88a7 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -40,7 +40,7 @@ let lispPackages = rec { url = "https://common-lisp.net/project/iterate/darcs/iterate"; sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; context = ./iterate.darcs-context; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); overrides = x: { configurePhase="buildPhase(){ true; }"; }; @@ -314,7 +314,7 @@ let lispPackages = rec { src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); }; cl-fuse-meta-fs = buildLispPackage rec { diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 3167f7ffc225..df972a4287bd 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cacert ]; - configureFlags = [ "--with-ca-bundle=${cacert}/etc/ca-bundle.crt" ]; + configureFlags = [ "--with-ca-bundle=${cacert}/ca-bundle.crt" ]; meta = with stdenv.lib; { homepage = http://aria2.sourceforge.net/; From cd52c044568bdf1108428698048a9af92dc0b625 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 14:26:07 -0700 Subject: [PATCH 124/127] Fix more ca-bundle paths --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- pkgs/applications/networking/browsers/vimb/default.nix | 4 ++-- .../networking/browsers/vimprobable2/default.nix | 4 ++-- .../instant-messengers/telepathy/gabble/default.nix | 4 ++-- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/core/rest/default.nix | 4 ++-- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- pkgs/servers/mail/opensmtpd/default.nix | 2 +- pkgs/tools/security/prey/default.nix | 5 +++-- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index d438bb77b859..27dde61a08c2 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils -, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme }: +, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme, cacert }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ @@ -13,7 +13,7 @@ let sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn"; }; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; buildInputs = [ pkgconfig glib libsoup ]; }; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index b30b2e260e32..24a43d95ca9b 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking -, gsettings_desktop_schemas, makeWrapper +, gsettings_desktop_schemas, makeWrapper, cacert }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/config.def.h + sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, src/config.def.h ''; buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 8e1e00795d24..7ab5c397abe5 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl, - pkgconfig, webkit, gsettings_desktop_schemas }: + pkgconfig, webkit, gsettings_desktop_schemas, cacert }: stdenv.mkDerivation rec { version = "1.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, config.h + sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, config.h ''; buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index e8e76c10ea5e..b7cebd47cd71 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon -, sqlite, libsoup, libnice, gnutls }: +, sqlite, libsoup, libnice, gnutls, cacert }: stdenv.mkDerivation rec { name = "telepathy-gabble-0.18.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ] ++ stdenv.lib.optional doCheck dbus_daemon; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index a9fbd89f3fa1..dee2abd2b1f3 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, docutils, unzip -, guiSupport ? false, tk ? null, curses }: +, guiSupport ? false, tk ? null, curses, cacert }: let version = "3.3.3"; @@ -44,7 +44,7 @@ stdenv.mkDerivation { mkdir -p $out/etc/mercurial cat >> $out/etc/mercurial/hgrc << EOF [web] - cacerts = /etc/ssl/certs/ca-bundle.crt + cacerts = ${cacert}/ca-bundle.crt EOF # copy hgweb.cgi to allow use in apache diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix index d1bfee5c14a3..101dbb8cc488 100644 --- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacerts }: stdenv.mkDerivation rec { name = "rest-0.7.92"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacerts}/ca-bundle.crt"; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 6f0394823a6e..79c8ac031832 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy -, gsettings_desktop_schemas }: +, gsettings_desktop_schemas, cacert }: let ver_maj = "2.44"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"; }; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; preBuild = '' sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index b796e12e9f4a..a22da36d2b6e 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-sock-dir=/run" "--with-privsep-user=smtpd" "--with-queue-user=smtpq" - "--with-ca-file=/etc/ssl/certs/ca-bundle.crt" + "--with-ca-file=${cacert}/ca-bundle.crt" ]; installFlags = [ diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index 0333e931858c..c0951760f4fd 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils +{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils +, makeWrapper, coreutils, cacert , apiKey ? "" , deviceKey ? "" }: @@ -35,7 +36,7 @@ in stdenv.mkDerivation rec { cp -R ${modulesSrc}/* $out/modules/ wrapProgram "$out/prey.sh" \ --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ - --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-bundle.crt" + --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt" ''; meta = with stdenv.lib; { From b07929b0a389541a7272deacbd305de2b48cce90 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 27 May 2015 12:42:15 -0700 Subject: [PATCH 125/127] Use libpulseaudio instead of pulseaudio --- pkgs/applications/audio/bristol/default.nix | 6 +++--- pkgs/applications/audio/cmus/default.nix | 4 ++-- pkgs/applications/audio/csound/default.nix | 4 ++-- pkgs/applications/audio/deadbeef/default.nix | 6 +++--- pkgs/applications/audio/ekho/default.nix | 4 ++-- pkgs/applications/audio/fldigi/default.nix | 4 ++-- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- pkgs/applications/audio/lmms/default.nix | 4 ++-- pkgs/applications/audio/mhwaveedit/default.nix | 4 ++-- pkgs/applications/audio/minimodem/default.nix | 4 ++-- pkgs/applications/audio/pamixer/default.nix | 4 ++-- pkgs/applications/audio/paprefs/default.nix | 4 ++-- pkgs/applications/audio/pavucontrol/default.nix | 4 ++-- pkgs/applications/audio/projectm/default.nix | 4 ++-- pkgs/applications/audio/qmmp/default.nix | 4 ++-- pkgs/applications/audio/sonic-visualiser/default.nix | 4 ++-- pkgs/applications/misc/gqrx/default.nix | 6 +++--- .../networking/browsers/chromium/common.nix | 4 ++-- .../networking/browsers/firefox-bin/default.nix | 4 ++-- .../mozilla-plugins/google-talk-plugin/default.nix | 4 ++-- .../networking/instant-messengers/oneteam/default.nix | 2 +- .../networking/instant-messengers/sflphone/default.nix | 4 ++-- .../networking/instant-messengers/skype/default.nix | 4 ++-- .../networking/instant-messengers/teamspeak/client.nix | 4 ++-- .../applications/networking/remote/freerdp/default.nix | 2 +- .../networking/remote/freerdp/unstable.nix | 6 +++--- .../applications/office/zotero/firefox-bin/default.nix | 4 ++-- pkgs/applications/video/aegisub/default.nix | 6 +++--- pkgs/applications/video/bomi/default.nix | 6 +++--- pkgs/applications/video/kodi/default.nix | 6 +++--- pkgs/applications/video/mplayer/default.nix | 6 +++--- pkgs/applications/video/mpv/default.nix | 6 +++--- pkgs/applications/video/mythtv/default.nix | 4 ++-- .../video/simplescreenrecorder/default.nix | 4 ++-- pkgs/applications/video/vlc/default.nix | 4 ++-- pkgs/applications/virtualization/qemu/default.nix | 10 ---------- .../applications/virtualization/virtualbox/default.nix | 4 ++-- pkgs/desktops/cinnamon/cinnamon-control-center.nix | 4 ++-- pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix | 4 ++-- pkgs/desktops/e19/efl.nix | 4 ++-- .../gnome-2/desktop/gnome-settings-daemon/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/core/empathy/default.nix | 4 ++-- .../gnome-3/3.16/core/gnome-control-center/default.nix | 4 ++-- .../3.16/core/gnome-settings-daemon/default.nix | 4 ++-- .../desktops/gnome-3/3.16/core/gnome-shell/default.nix | 4 ++-- pkgs/desktops/kde-4.14/kde-runtime.nix | 4 ++-- pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix | 4 ++-- .../desktops/xfce/applications/xfce4-volumed-pulse.nix | 4 ++-- pkgs/development/compilers/squeak/default.nix | 4 ++-- pkgs/development/haskell-modules/hackage-packages.nix | 6 +++--- pkgs/development/libraries/SDL/default.nix | 6 +++--- pkgs/development/libraries/SDL2/default.nix | 6 +++--- pkgs/development/libraries/despotify/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg-full/default.nix | 6 +++--- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++-- pkgs/development/libraries/gstreamer/good/default.nix | 4 ++-- .../gstreamer/legacy/gst-plugins-good/default.nix | 4 ++-- pkgs/development/libraries/libao/default.nix | 4 ++-- pkgs/development/libraries/libcanberra/default.nix | 4 ++-- pkgs/development/libraries/libmikmod/default.nix | 6 +++--- pkgs/development/libraries/mediastreamer/default.nix | 4 ++-- pkgs/development/libraries/openal-soft/default.nix | 6 +++--- pkgs/development/libraries/phonon/qt4/default.nix | 4 ++-- pkgs/development/libraries/phonon/qt5/default.nix | 4 ++-- pkgs/development/libraries/qt-5/5.3/default.nix | 4 ++-- pkgs/development/libraries/qt-5/5.4/default.nix | 4 ++-- pkgs/development/libraries/spice-gtk/default.nix | 4 ++-- pkgs/development/libraries/xine-lib/default.nix | 4 ++-- pkgs/games/adom/default.nix | 4 ++-- pkgs/games/anki/default.nix | 4 ++-- pkgs/games/minecraft/default.nix | 4 ++-- pkgs/games/scrolls/default.nix | 4 ++-- pkgs/games/stepmania/default.nix | 4 ++-- pkgs/games/vessel/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/master.nix | 4 ++-- pkgs/misc/emulators/higan/default.nix | 4 ++-- pkgs/misc/emulators/retroarch/default.nix | 4 ++-- pkgs/misc/emulators/snes9x-gtk/default.nix | 4 ++-- pkgs/servers/mpd/default.nix | 4 ++-- pkgs/servers/shairport-sync/default.nix | 4 ++-- pkgs/tools/admin/gtk-vnc/default.nix | 4 ++-- pkgs/tools/audio/liquidsoap/full.nix | 4 ++-- pkgs/tools/audio/pa-applet/default.nix | 4 ++-- pkgs/tools/audio/pasystray/default.nix | 4 ++-- pkgs/tools/bluetooth/blueman/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 87 files changed, 184 insertions(+), 194 deletions(-) diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index b27ac0586025..d45ab8182731 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, libpulseaudio, xlibs }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext + alsaLib jack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext xlibs.xproto ]; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index fd252754d660..a5cfdf227bb3 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, pulseaudio}: +{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}: stdenv.mkDerivation rec { name = "cmus-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue pulseaudio ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue libpulseaudio ]; meta = { description = "Small, fast and powerful console music player for Linux and *BSD"; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 64f3f3586a36..693d8e2a6e50 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, libsndfile, flex, bison , alsaLib ? null -, pulseaudio ? null +, libpulseaudio ? null , tcltk ? null # maybe csound can be compiled with support for those, see configure output @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m"; }; - buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; + buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ]; meta = { description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index ca8ce453e63d..9dd4db684326 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -18,7 +18,7 @@ , osdSupport ? true, dbus ? null # output plugins , alsaSupport ? true, alsaLib ? null -, pulseSupport ? true, pulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null # effect plugins , resamplerSupport ? true, libsamplerate ? null , overloadSupport ? true, zlib ? null @@ -41,7 +41,7 @@ assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; assert osdSupport -> dbus != null; assert alsaSupport -> alsaLib != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert resamplerSupport -> libsamplerate != null; assert overloadSupport -> zlib != null; assert wavpackSupport -> wavpack != null; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ++ optional hotkeysSupport libX11 ++ optional osdSupport dbus ++ optional alsaSupport alsaLib - ++ optional pulseSupport pulseaudio + ++ optional pulseSupport libpulseaudio ++ optional resamplerSupport libsamplerate ++ optional overloadSupport zlib ++ optional wavpackSupport wavpack diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index dd9b830be841..78383eec9539 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, libsndfile, pulseaudio +, libsndfile, libpulseaudio }: let @@ -35,5 +35,5 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsndfile pulseaudio ]; + buildInputs = [ libsndfile libpulseaudio ]; } diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 5a4793a09c19..8e80992d7cad 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile, - libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: + libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { version = "3.22.02"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio - libsndfile libsamplerate pulseaudio pkgconfig alsaLib ]; + libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ]; meta = { description = "Digital modem program"; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8cba482194e5..339cccfca704 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig -, pulseaudio }: +, libpulseaudio }: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-framework CoreAudio"; buildInputs = [ glib libsndfile pkgconfig ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ]; + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio jack2 ]; meta = with stdenv.lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 6d28c038f232..830d42eb91b0 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth , fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig -, pulseaudio, qt4, freetype +, libpulseaudio, qt4, freetype }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2 - libsamplerate libsndfile libvorbis pkgconfig pulseaudio qt4 + libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index a1e81be3cb37..0234a1d3fe5b 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }: +, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio }: stdenv.mkDerivation rec { name = "mhwaveedit-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile - pkgconfig pulseaudio + pkgconfig libpulseaudio ]; configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index 6f2bf8cdb1c7..af4e887d1677 100644 --- a/pkgs/applications/audio/minimodem/default.nix +++ b/pkgs/applications/audio/minimodem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, pulseaudio }: +{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, linbpulseaudio }: stdenv.mkDerivation rec { version = "0.19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g"; }; - buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile pulseaudio ]; + buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; meta = { description = "General-purpose software audio FSK modem"; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index d665b83340cf..31353cec6a91 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, pulseaudio }: +{ stdenv, fetchurl, boost, libpulseaudio }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ad6b46hh02hs1978pgihrm2bnq4z2v0imrfm3wy74xdkr6xjxy4"; }; - buildInputs = [ boost pulseaudio ]; + buildInputs = [ boost libpulseaudio ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index f05c4068a60b..06b4b44b5963 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libglademm +{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm , dbus_glib, gconfmm, intltool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ pulseaudio gtkmm libglademm dbus_glib gconfmm ]; + buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 7e392679c712..8db0a94a9904 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3 +{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 , libcanberra_gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; - buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 508b6743cc39..fcfde86f7ee3 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -3,7 +3,7 @@ , withQt ? true, qt4 , withLibvisual ? false, libvisual, SDL , withJack ? false, jack2 -, withPulseAudio ? true, pulseaudio +, withPulseAudio ? true, libpulseaudio }: assert withJack -> withQt; @@ -46,6 +46,6 @@ stdenv.mkDerivation { ++ optional withQt qt4 ++ optionals withLibvisual [ libvisual SDL ] ++ optional withJack jack2 - ++ optional withPulseAudio pulseaudio + ++ optional withPulseAudio libpulseaudio ; } diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 1a447be56b4d..1b9323c1a7ba 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -5,7 +5,7 @@ , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile , libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi # output plugins -, alsaLib, pulseaudio +, alsaLib, libpulseaudio # effect plugins , libsamplerate }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile libcdio cdparanoia libcddb faad2 ffmpeg wildmidi # output plugins - alsaLib pulseaudio + alsaLib libpulseaudio # effect plugins libsamplerate ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 104a458d6a06..9cd1a3d03458 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, pulseaudio, qt5, redland +, libsndfile, pkgconfig, libpulseaudio, qt5, redland , rubberband, serd, sord, vampSDK }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # optional jack2 # portaudio - pulseaudio + libpulseaudio libmad libogg # ? # fishsound diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 169331ceb733..440d2b790c21 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr # drivers (optional): , rtl-sdr -, pulseaudioSupport ? true, pulseaudio +, pulseaudioSupport ? true, libpulseaudio }: -assert pulseaudioSupport -> pulseaudio != null; +assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 gnuradio boost gnuradio-osmosdr rtl-sdr - ] ++ stdenv.lib.optionals pulseaudioSupport [ pulseaudio ]; + ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; configurePhase = ''qmake PREFIX="$out"''; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3d85afef8f49..1f6c272aceb2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -26,7 +26,7 @@ , gnomeKeyringSupport ? false, libgnome_keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true -, pulseSupport ? false, pulseaudio ? null +, pulseSupport ? false, libpulseaudio ? null , hiDPISupport ? false , source @@ -118,7 +118,7 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport pulseaudio; + ++ optional pulseSupport libpulseaudio; # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to # be fixed, then try again to unbundle everything into separate diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 23726f5c3d18..998ea95e8da6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -31,7 +31,7 @@ , nss , pango , heimdal -, pulseaudio +, libpulseaudio , systemd }: @@ -103,7 +103,7 @@ stdenv.mkDerivation { nss pango heimdal - pulseaudio + libpulseaudio systemd ] + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index bdccb932e1c3..6fd953636a83 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo , libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, pulseaudio, udev, pango +, dbus_glib, alsaLib, libpulseaudio, udev, pango }: with stdenv.lib; @@ -34,7 +34,7 @@ let xorg.libXrandr stdenv.cc.cc alsaLib - pulseaudio + libpulseaudio dbus_glib udev curl diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 14d01de32458..2ab0930842bc 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig - , pulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto + , libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto , ...}: builderDefsPackage (a : diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index fb14782ef9f6..8b259c90fe50 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate +{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, libpulseaudio, libsamplerate , commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus , autoconf, automake, libtool, gettext, perl , cmake, qt4 @@ -43,7 +43,7 @@ rec { configureFlags = "--with-expat --with-expat-inc=${expat}/include " + "--with-expat-lib=-lexpat --with-opus "; - buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate + buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus autoconf automake libtool gettext perl ]; }; diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 218e7303807b..1e84e015bc14 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib , libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig -, pulseaudio, lib, ... }: +, libpulseaudio, lib, ... }: assert stdenv.system == "i686-linux"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libXi libXrender libXrandr - pulseaudio + libpulseaudio freetype fontconfig zlib diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index df4f7054ad3b..51707d2dca65 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg -, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null +, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null , libredirect, quazip, less, which }: @@ -12,7 +12,7 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base pulseaudio + xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio ]; in diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 092e6f53e493..f773cf6755e2 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -15,7 +15,7 @@ #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt , libXinerama , libXv -, pulseaudioSupport ? true, pulseaudio +, pulseaudioSupport ? true, libpulseaudio }: assert printerSupport -> cups != null; diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index e66f78f2602d..cc6ec9bd2315 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv , substituteAll -, pulseaudio ? null, cups ? null, pcsclite ? null +, libpulseaudio ? null, cups ? null, pcsclite ? null , buildServer ? true, optimize ? true }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib - alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite + alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite ]; doCheck = false; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DWITH_CUNIT=OFF" - ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON" + ] ++ stdenv.lib.optional (libpulseaudio != null) "-DWITH_PULSE=ON" ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON" ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON" ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON" diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix index 0018f00a3662..52751908fa71 100644 --- a/pkgs/applications/office/zotero/firefox-bin/default.nix +++ b/pkgs/applications/office/zotero/firefox-bin/default.nix @@ -31,7 +31,7 @@ , nss , pango , heimdal -, pulseaudio +, libpulseaudio , systemd }: @@ -103,7 +103,7 @@ stdenv.mkDerivation { nss pango heimdal - pulseaudio + libpulseaudio systemd ] + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index e7cc9b78195f..a5c14d0888ff 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -9,14 +9,14 @@ , automationSupport ? true, lua ? null , openalSupport ? false, openal ? null , alsaSupport ? true, alsaLib ? null -, pulseaudioSupport ? true, pulseaudio ? null +, pulseaudioSupport ? true, libpulseaudio ? null , portaudioSupport ? false, portaudio ? null }: assert spellcheckSupport -> (hunspell != null); assert automationSupport -> (lua != null); assert openalSupport -> (openal != null); assert alsaSupport -> (alsaLib != null); -assert pulseaudioSupport -> (pulseaudio != null); +assert pulseaudioSupport -> (libpulseaudio != null); assert portaudioSupport -> (portaudio != null); with stdenv.lib; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ++ optional automationSupport lua ++ optional openalSupport openal ++ optional alsaSupport alsaLib - ++ optional pulseaudioSupport pulseaudio + ++ optional pulseaudioSupport libpulseaudio ++ optional portaudioSupport portaudio ; diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index be0517b6376b..2f0c3070921a 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -13,7 +13,7 @@ , libbluray , jackSupport ? false, jack ? null , portaudioSupport ? false, portaudio ? null -, pulseSupport ? true, pulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null , cddaSupport ? false, libcdda ? null , youtubeSupport ? true, youtube-dl ? null }: @@ -22,7 +22,7 @@ with stdenv.lib; assert jackSupport -> jack != null; assert portaudioSupport -> portaudio != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert cddaSupport -> libcdda != null; assert youtubeSupport -> youtube-dl != null; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ] ++ optional jackSupport jack ++ optional portaudioSupport portaudio - ++ optional pulseSupport pulseaudio + ++ optional pulseSupport libpulseaudio ++ optional cddaSupport libcdda ; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 0b18705e6fbe..dafa381d9eca 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -23,7 +23,7 @@ # TODO: would be nice to have nfsSupport (needs libnfs library) # TODO: librtmp , libvdpau ? null, vdpauSupport ? true -, pulseaudio ? null, pulseSupport ? true +, libpulseaudio ? null, pulseSupport ? true , libcec ? null, cecSupport ? true }: @@ -32,7 +32,7 @@ assert udevSupport -> udev != null; assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable assert sambaSupport -> samba != null; assert vdpauSupport -> libvdpau != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert cecSupport -> libcec != null; let @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { ++ lib.optional usbSupport libusb ++ lib.optional sambaSupport samba ++ lib.optional vdpauSupport libvdpau - ++ lib.optional pulseSupport pulseaudio + ++ lib.optional pulseSupport libpulseaudio ++ lib.optional cecSupport libcec; dontUseCmakeConfigure = true; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index ac106431240d..57f8289a1f92 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -18,7 +18,7 @@ , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null , jackaudioSupport ? false, jack2 ? null -, pulseSupport ? false, pulseaudio ? null +, pulseSupport ? false, libpulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null @@ -45,7 +45,7 @@ assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; assert jackaudioSupport -> jack2 != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; assert libjpegSupport -> libjpeg != null; @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { ++ optional jackaudioSupport jack2 ++ optionals amrSupport [ amrnb amrwb ] ++ optional x264Support x264 - ++ optional pulseSupport pulseaudio + ++ optional pulseSupport libpulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional lameSupport lame ++ optional vdpauSupport libvdpau diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 6bb7072a4a31..03cb5154f853 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -13,7 +13,7 @@ , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null , jackaudioSupport ? true, jack2 ? null -, pulseSupport ? true, pulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null @@ -40,7 +40,7 @@ assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert jackaudioSupport -> jack2 != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; assert youtubeSupport -> youtube-dl != null; @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray ++ optional jackaudioSupport jack2 - ++ optional pulseSupport pulseaudio + ++ optional pulseSupport libpulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau ++ optional speexSupport speex diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 2bc635d510eb..cd157a473e62 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec +{ stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/mythtv"; buildInputs = [ - freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec + freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib ]; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 7320a7f6d74d..453829bc580e 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext -, libXfixes, mesa, pkgconfig, pulseaudio, qt4 +, libXfixes, mesa, pkgconfig, libpulseaudio, qt4 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig - pulseaudio qt4 + libpulseaudio qt4 ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index a404ba0d1a8a..85fc6f6b6ba7 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -2,7 +2,7 @@ , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp -, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg +, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt - libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec + libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bf722431d910..0d57a8d9f575 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -13,16 +13,6 @@ # Audio libraries , libpulseaudio ? null, alsaLib ? null -#, pixman ? null -#, python, zlib, glib, ncurses, perl -#, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -#, libseccomp, libaio, libcap_ng, gnutls -#, makeWrapper -#, pulseSupport ? true, pulseaudio -#, sdlSupport ? true, SDL -#, vncSupport ? true, libjpeg, libpng -#, spiceSupport ? true, spice, spice_protocol, usbredir - # Extra options , type ? "" }: diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 158d99f64880..31a148300346 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -5,7 +5,7 @@ , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null -, pulseSupport ? false, pulseaudio ? null +, pulseSupport ? false, libpulseaudio ? null , enableHardening ? false }: @@ -69,7 +69,7 @@ in stdenv.mkDerivation { pkgconfig which libXmu nukeReferences ] ++ optional javaBindings jdk ++ optional pythonBindings python - ++ optional pulseSupport pulseaudio; + ++ optional pulseSupport libpulseaudio; prePatch = '' set -x diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center.nix b/pkgs/desktops/cinnamon/cinnamon-control-center.nix index bb53ecfd9019..97489a7ec087 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify, -gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, pulseaudio, isocodes, kerberos, +gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, libpulseaudio, isocodes, kerberos, libxkbfile}: let @@ -24,7 +24,7 @@ stdenv.mkDerivation { intltool libxslt gtk3 cinnamon-desktop libnotify gnome-menus libxml2 systemd upower cinnamon-settings-daemon colord - polkit ibus libcanberra_gtk3 pulseaudio + polkit ibus libcanberra_gtk3 libpulseaudio isocodes kerberos libxkbfile ]; preBuild = "patchShebangs ./scripts"; diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix index ca220fd9d855..550a7acaf62e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3, -libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, pulseaudio, upower, libcanberra_gtk3, colord, +libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, libpulseaudio, upower, libcanberra_gtk3, colord, systemd, libxslt, docbook_xsl, makeWrapper, gsettings_desktop_schemas}: let @@ -25,7 +25,7 @@ stdenv.mkDerivation { glib gettext gnome_common intltool gtk3 libnotify lcms2 libgnomekbd libxklavier colord - libcanberra pulseaudio upower + libcanberra libpulseaudio upower libcanberra_gtk3 cinnamon-desktop systemd libxslt docbook_xsl makeWrapper gsettings_desktop_schemas diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index ada0f4650d27..6fb262ac50ac 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto + gst_all_1.gst-libav libpulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 udev utillinuxCurses ]; propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index dca3b3a16a2e..93dfa544ea91 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, pulseaudio }: +, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio }: stdenv.mkDerivation { name = "gnome-settings-daemon-2.32.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit - pulseaudio + libpulseaudio ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix index ab5ea0cbccaf..ef344c5bf55c 100644 --- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix @@ -2,7 +2,7 @@ , file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf , dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, pulseaudio, telepathy_mission_control +, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control , telepathy_logger, libnotify, clutter, libsoup, gnutls , evolution_data_server , libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libxml2 libxslt icu file makeWrapper telepathy_glib clutter_gtk clutter-gst cogl gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf + gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf libnotify clutter libsoup gnutls libgee p11_kit libcanberra_gtk3 telepathy_farstream farstream gnome3.adwaita-icon-theme hicolor_icon_theme diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index 725aa6a6b128..0c676c38efa9 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, pulseaudio, fontconfig +, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, libkrb5, networkmanagerapplet, networkmanager @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus - gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality + gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix index e4d2d80e9f47..76c770e51d6b 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager , docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager - libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio + libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio libcanberra_gtk3 upower colord libgweather xkeyboard_config polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix index f99c0c2b5a46..c49a4503d638 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix @@ -2,7 +2,7 @@ , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip , sqlite, libgweather, libcanberra_gtk3 -, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper +, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns - libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server + libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm libcanberra_gtk3 gnome_control_center defaultIconTheme sqlite gnome3.gnome-bluetooth diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index 2b8df4757de0..ddda04fd3705 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -1,5 +1,5 @@ { kde, kdelibs, bzip2, libssh, exiv2, attica, qca2 -, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio +, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme }: @@ -8,7 +8,7 @@ kde { buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack - qca2 samba libcanberra pulseaudio gpgme + qca2 samba libcanberra libpulseaudio gpgme networkmanager kactivities kdepimlibs openexr #todo: add openslp #todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix index 1dd8108166f2..8d8bc84e16ef 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix @@ -1,6 +1,6 @@ -{ kde, kdelibs, libcanberra, pulseaudio }: +{ kde, kdelibs, libcanberra, libpulseaudio }: kde { - buildInputs = [ kdelibs libcanberra pulseaudio ]; + buildInputs = [ kdelibs libcanberra libpulseaudio ]; meta = { description = "sound mixer, an application to allow you to change the volume of your sound card"; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix index 087ba0f2c815..8cbb4cca93c1 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pulseaudio +{ stdenv, fetchurl, pkgconfig, libpulseaudio , gtk2, libnotify , keybinder, xfconf }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pulseaudio gtk2 + [ libpulseaudio gtk2 keybinder xfconf libnotify ]; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 4a6408d66d11..816803d4bd99 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused -, libpthreadstubs, pango, pkgconfig, pulseaudio, which }: +, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }: let version = "4.10.2.2614"; in stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs - pango pkgconfig pulseaudio which ]; + pango pkgconfig libpulseaudio which ]; postPatch = '' for i in squeak.in squeak.sh.in; do diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d24e5f44828f..7ca94fe04999 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -101495,16 +101495,16 @@ self: { }) {}; "pulse-simple" = callPackage - ({ mkDerivation, base, bytestring, pulseaudio }: + ({ mkDerivation, base, bytestring, libpulseaudio }: mkDerivation { pname = "pulse-simple"; version = "0.1.14"; sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4"; buildDepends = [ base bytestring ]; - extraLibraries = [ pulseaudio ]; + extraLibraries = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) pulseaudio;}; + }) { inherit (pkgs) libpulseaudio;}; "punkt" = callPackage ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index f23955228f75..3e00b21ad43e 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -2,7 +2,7 @@ , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, x11 ? null, libXrandr ? null -, pulseaudioSupport ? true, pulseaudio ? null +, pulseaudioSupport ? true, libpulseaudio ? null }: # OSS is no longer supported, for it's much crappier than ALSA and @@ -12,7 +12,7 @@ assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport assert openglSupport -> (mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); assert alsaSupport -> alsaLib != null; -assert pulseaudioSupport -> pulseaudio != null; +assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "1.2.15"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { propagatedNativeBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ stdenv.lib.optional alsaSupport alsaLib ++ - stdenv.lib.optional pulseaudioSupport pulseaudio; + stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = let notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt"; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index ade6bc620e4f..bfd5ff65563c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -2,7 +2,7 @@ , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, x11 ? null, libXrandr ? null -, pulseaudioSupport ? true, pulseaudio ? null +, pulseaudioSupport ? true, libpulseaudio ? null }: # OSS is no longer supported, for it's much crappier than ALSA and @@ -12,7 +12,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); assert alsaSupport -> alsaLib != null; -assert pulseaudioSupport -> pulseaudio != null; +assert pulseaudioSupport -> libpulseaudio != null; let configureFlagsFun = attrs: '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ - stdenv.lib.optional pulseaudioSupport pulseaudio; + stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = [ pkgconfig audiofile ] ++ stdenv.lib.optional openglSupport [ mesa ] ++ diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix index 172a823cfdc5..2cb241b04276 100644 --- a/pkgs/development/libraries/despotify/default.nix +++ b/pkgs/development/libraries/despotify/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchsvn, openssl, zlib, libvorbis, pulseaudio, gstreamer, libao, + stdenv, fetchsvn, openssl, zlib, libvorbis, libpulseaudio, gstreamer, libao, libtool, ncurses, glibc }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - openssl zlib libvorbis pulseaudio gstreamer libao libtool ncurses glibc + openssl zlib libvorbis libpulseaudio gstreamer libao libtool ncurses glibc ]; configurePhase = "cd src"; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index fd5ca0545a3b..aee67f5cd770 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -108,7 +108,7 @@ #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null -, pulseaudio ? null # Pulseaudio input support +, libpulseaudio ? null # Pulseaudio input support , rtmpdump ? null # RTMP[E] support #, libquvi ? null # Quvi input support , samba ? null # Samba protocol @@ -361,7 +361,7 @@ stdenv.mkDerivation rec { #(enableFeature (openh264 != null) "openh264") (enableFeature (openjpeg_1 != null) "libopenjpeg") (enableFeature (opensslExtlib && gplLicensing) "openssl") - (enableFeature (pulseaudio != null) "libpulse") + (enableFeature (libpulseaudio != null) "libpulse") #(enableFeature quvi "libquvi") (enableFeature (rtmpdump != null) "librtmp") #(enableFeature (schroedinger != null) "libschroedinger") @@ -399,7 +399,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXext libXfixes libXv lzma openal openjpeg_1 pulseaudio rtmpdump + libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib mesa ++ optionals x11grabExtlib [ libXext libXfixes ] diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 13a339740f45..99d8fe679ab3 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr +, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, libpulseaudio, SDL, soxr , x264, xvidcore, zlib , openglSupport ? false, mesa ? null # Build options @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib ] ++ optional openglSupport mesa - ++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin + ++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin ++ optional (isLinux || isFreeBSD) libva ++ optional isLinux alsaLib; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 51ad836b6449..c999c65229e4 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -3,7 +3,7 @@ , libv4l, libdv, libavc1394, libiec61883 , libvpx, speex, flac, taglib , cairo, gdk_pixbuf, aalib, libcaca -, libsoup, pulseaudio, libintlOrEmpty +, libsoup, libpulseaudio, libintlOrEmpty }: let @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libsoup ] ++ libintlOrEmpty - ++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ]; + ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; LDFLAGS = optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 1db7e4dbd550..deca854008a0 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx -, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc +, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2, libsoup, libintlOrEmpty , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib gstreamer gst_plugins_base ] - ++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ] + ++ stdenv.lib.optional stdenv.isLinux [ libpulseaudio ] ++ libintlOrEmpty ++ stdenv.lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 72b364bb3642..ee92da283a69 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib, libcap +{ lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap , usePulseAudio }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libcap ] ++ - lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]); + lib.optional stdenv.isLinux (if usePulseAudio then [ libpulseaudio ] else [ alsaLib ]); meta = { longDescription = '' diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 0d9474e585e7..2510e3b86212 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap -, alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }: +, alsaLib, libpulseaudio, gstreamer, gst_plugins_base, libvorbis }: stdenv.mkDerivation rec { name = "libcanberra-0.30"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libtool alsaLib pulseaudio libvorbis gtk libcap + pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap /*gstreamer gst_plugins_base*/ # ToDo: gstreamer not found (why?), add (g)udev? ]; diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 2146562c5cb7..0f3ea26eb043 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, alsaLib, pulseaudio }: +{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio }: stdenv.mkDerivation rec { name = "libmikmod-3.3.7"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ stdenv.lib.optional stdenv.isLinux [ alsaLib pulseaudio ]; + ++ stdenv.lib.optional stdenv.isLinux [ alsaLib libpulseaudio ]; propagatedBuildInputs = - stdenv.lib.optional stdenv.isLinux pulseaudio; + stdenv.lib.optional stdenv.isLinux libpulseaudio; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 586a10bd1a87..19e71fd66c12 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, pulseaudio, speex, gsm +{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, vim }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ - alsaLib pulseaudio speex gsm libopus + alsaLib libpulseaudio speex gsm libopus ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp ortp libv4l libpcap srtp vim diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index eedc9e9ff93f..89dc32b61f27 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake , alsaSupport ? true, alsaLib ? null -, pulseSupport ? true, pulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null }: with stdenv.lib; assert alsaSupport -> alsaLib != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "1.16.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ optional alsaSupport alsaLib - ++ optional pulseSupport pulseaudio; + ++ optional pulseSupport libpulseaudio; NIX_LDFLAGS = [] ++ optional alsaSupport "-lasound" diff --git a/pkgs/development/libraries/phonon/qt4/default.nix b/pkgs/development/libraries/phonon/qt4/default.nix index a127c063ffbe..9875b216e066 100644 --- a/pkgs/development/libraries/phonon/qt4/default.nix +++ b/pkgs/development/libraries/phonon/qt4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt4 }: +{ stdenv, fetchurl, cmake, automoc4, libpulseaudio, qt4 }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn"; }; - buildInputs = [ qt4 pulseaudio ]; + buildInputs = [ qt4 libpulseaudio ]; nativeBuildInputs = [ cmake automoc4 ]; diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix index 248e04277092..94d3b0fc0ded 100644 --- a/pkgs/development/libraries/phonon/qt5/default.nix +++ b/pkgs/development/libraries/phonon/qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, pkgconfig, pulseaudio, qt5, debug ? false }: +{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; }; - buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools pulseaudio ]; + buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 907cec49020c..693f62a63ebd 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -5,7 +5,7 @@ , gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage , xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon , alsaLib, gstreamer, gst_plugins_base -, pulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor +, libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor , flashplayerFix ? false , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , buildDocs ? false @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { xlibs.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu - libwebp alsaLib gstreamer gst_plugins_base pulseaudio + libwebp alsaLib gstreamer gst_plugins_base libpulseaudio xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index fe7e024ba4bc..fce2c7f1b7bf 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -147,14 +147,14 @@ let multimedia = callPackage ( { qtSubmodule, base, declarative - , alsaLib, gstreamer, gst_plugins_base, pulseaudio + , alsaLib, gstreamer, gst_plugins_base, libpulseaudio }: qtSubmodule { name = "qtmultimedia"; qtInputs = [ base declarative ]; buildInputs = [ - alsaLib gstreamer gst_plugins_base pulseaudio + alsaLib gstreamer gst_plugins_base libpulseaudio ]; } ) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index e7a048f0a312..d525c143d9c0 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1 -, openssl, pulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib +, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup , gtk3, enableGTK3 ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection + spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection libjpeg_turbo zlib cyrus_sasl python pygtk usbredir ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]); diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 11ba5df80ca8..89b2d77db82a 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib , libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg -, flac, libcaca, pulseaudio, libmng, libcdio, libv4l, vcdimager +, flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac - libcaca pulseaudio libmng libcdio libv4l vcdimager libmpcdec + libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss"; diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 25524528c5c8..d44da3d41b7c 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio +{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio , xlibs, plowshare }: assert stdenv.isLinux; @@ -8,7 +8,7 @@ let inherit (xlibs) libXext libX11; lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ - zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio]; + zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; in assert stdenv.is64bit; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 8cb38c859ed1..af90c8267050 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, lame, mplayer, pulseaudio, portaudio +{ stdenv, lib, fetchurl, lame, mplayer, libpulseaudio, portaudio , python, pyqt4, pythonPackages # This little flag adds a huge number of dependencies, but we assume that # everyone wants Anki to draw plots with statistics by default. @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio ] ++ lib.optional plotsSupport py.matplotlib; - buildInputs = [ python py.wrapPython lame mplayer pulseaudio ]; + buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ]; preConfigure = '' substituteInPlace anki \ diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 3198ad785f09..9a19366a074c 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm -, mesa, openal, alsaOss, pulseaudioSupport ? false, pulseaudio }: +, mesa, openal, alsaOss, pulseaudioSupport ? false, libpulseaudio }: assert jre ? architecture; @@ -23,7 +23,7 @@ stdenv.mkDerivation { # wrapper for minecraft export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/ - ${if pulseaudioSupport then "${pulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \ + ${if pulseaudioSupport then "${libpulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \ ${jre}/bin/java -jar $out/minecraft.jar EOF diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 376d1e334734..899c851c667d 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gcc -, mesa_glu, libX11, libXext, libXcursor, pulseaudio +, mesa_glu, libX11, libXext, libXcursor, libpulseaudio }: stdenv.mkDerivation { name = "scrolls-2014-03-08"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { libX11 libXext libXcursor - pulseaudio + libpulseaudio ]; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 82cffc8dec6f..99bafe95b757 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, pkgconfig, autoconf, automake, yasm, zlib, bzip2, alsaLib -, pulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk +, libpulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk , mesa, glew }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig autoconf automake yasm zlib bzip2 alsaLib pulseaudio libmad libtheora + pkgconfig autoconf automake yasm zlib bzip2 alsaLib libpulseaudio libmad libtheora libvorbis libpng libjpeg gtk mesa glew ]; diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index db389047ec77..f85fd267485d 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, SDL, pulseaudio, alsaLib }: +{ stdenv, requireFile, SDL, libpulseaudio, alsaLib }: stdenv.mkDerivation rec { name = "vessel-12082012"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ld_preload = ./isatty.c; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ; + + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; installPhase = '' mkdir -p $out/libexec/strangeloop/vessel/ diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 275e6f065200..461d3c11c3c4 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, libpthreadstubs, libXrandr, libXext, readline , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl -, pulseaudio ? null }: +, libpulseaudio ? null }: stdenv.mkDerivation rec { name = "dolphin-emu-4.0.2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - libXdmcp portaudio SDL wxGTK30 pulseaudio ]; + libXdmcp portaudio SDL wxGTK30 libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index cbff76610f1c..fd293298b45f 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, git, libpthreadstubs, libXrandr, libXext, readline , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb -, pulseaudio ? null }: +, libpulseaudio ? null }: stdenv.mkDerivation rec { name = "dolphin-emu-20150421"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - git libXdmcp portaudio SDL wxGTK30 libusb pulseaudio ]; + git libXdmcp portaudio SDL wxGTK30 libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 3eb60b81b814..95793de98845 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -3,7 +3,7 @@ , libX11, libXv , udev , mesa, SDL -, libao, openal, pulseaudio +, libao, openal, libpulseaudio , profile ? "performance" # Options: accuracy, balanced, performance , guiToolkit ? "gtk" # can be gtk or qt4 , gtk ? null, qt4 ? null }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig libX11 libXv udev mesa SDL libao openal pulseaudio ] + [ pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio ] ++ optionals (guiToolkit == "gtk") [ gtk ] ++ optionals (guiToolkit == "qt4") [ qt4 ]; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index faa143d92730..fa5e501c434c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit , freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib -, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }: +, libX11, libXext, libXxf86vm, libXdmcp, SDL, libpulseaudio ? null }: stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils - python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ]; + python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL libpulseaudio ]; patchPhase = '' export GLOBAL_CONFIG_DIR=$out/etc diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 760821e36543..32d47093d68c 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, pulseaudio}: +{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, libpulseaudio}: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 pulseaudio]; + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 libpulseaudio]; sourceRoot = "snes9x-${version}-src/gtk"; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index cac346e946e4..c1611952a1e4 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -17,7 +17,7 @@ , mmsSupport ? true, libmms , mpg123Support ? true, mpg123 , aacSupport ? true, faad2 -, pulseaudioSupport ? true, pulseaudio +, pulseaudioSupport ? true, libpulseaudio , jackSupport ? true, jack2 , gmeSupport ? true, game-music-emu , icuSupport ? true, icu @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ++ opt mpg123Support mpg123 ++ opt aacSupport faad2 ++ opt zipSupport zziplib - ++ opt pulseaudioSupport pulseaudio + ++ opt pulseaudioSupport libpulseaudio ++ opt jackSupport jack2 ++ opt gmeSupport game-music-emu ++ opt icuSupport icu diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 167054330842..2bfe74900f6a 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, pulseaudio }: +{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, libpulseaudio }: stdenv.mkDerivation rec { version = "2.3.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { popt unzip libconfig - pulseaudio + libpulseaudio ]; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 9fc6d135625d..15cb56926a8a 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gobjectIntrospection , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 -, libffi, cyrus_sasl, intltool, perl, perlPackages, pulseaudio +, libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala , pygobject3, libogg, enableGTK3 ? false, libgpgerror }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ python gnutls cairo libtool pkgconfig glib libffi libgcrypt - intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV + intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV gobjectIntrospection libogg libgpgerror ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]); diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index d310d5017eda..1da9a6f465c9 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, which, pkgconfig , ocaml, ocamlPackages -, libao, portaudio, alsaLib, pulseaudio, jack2 +, libao, portaudio, alsaLib, libpulseaudio, jack2 , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, fdk_aac , faad2, flac, ladspaH, ffmpeg, frei0r, dssi @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ which ocaml ocamlPackages.findlib pkgconfig - libao portaudio alsaLib pulseaudio jack2 + libao portaudio alsaLib libpulseaudio jack2 libsamplerate libmad taglib lame libogg libvorbis speex libtheora libopus fdk_aac faad2 flac ladspaH ffmpeg frei0r dssi diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 6d5dd6ffca05..d6dcba322331 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: +{ stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: stdenv.mkDerivation rec { name = "pa-applet"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk3 pulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev + gtk3 libpulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev ]; preConfigure = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index c542386cb5a7..d214a75b4416 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig -, gnome3, avahi, gtk3, libnotify, pulseaudio, x11}: +, gnome3, avahi, gtk3, libnotify, libpulseaudio, x11}: stdenv.mkDerivation rec { name = "pasystray-0.5.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake makeWrapper pkgconfig gnome3.defaultIconTheme - avahi gtk3 libnotify pulseaudio x11 ]; + avahi gtk3 libnotify libpulseaudio x11 ]; preConfigure = '' aclocal diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index a9a167355edb..5330dfb82bd2 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk , notify, pythonDBus, bluez, glib, gtk, libstartup_notification , makeWrapper, xdg_utils, obex_data_server -, pulseaudio +, libpulseaudio }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { for i in $out/bin/* $out/libexec/*; do wrapProgram $i \ --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \ - --set LD_LIBRARY_PATH "${pulseaudio}/lib:" \ + --set LD_LIBRARY_PATH "${libpulseaudio}/lib:" \ --prefix PATH : ${xdg_utils}/bin done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bf44bf54046..ebd50429c540 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5959,7 +5959,7 @@ let libvpx = if stdenv.isDarwin then null else libvpx; openal = if stdenv.isDarwin then null else openal; openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1; - pulseaudio = if stdenv.isDarwin then null else pulseaudio; + libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; From b9a366e5c4d0e9fdd92d9c2a1f7ef24bea5be656 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 11:41:17 -0700 Subject: [PATCH 126/127] Fix typo --- pkgs/applications/audio/minimodem/default.nix | 2 +- pkgs/desktops/gnome-3/3.16/core/rest/default.nix | 4 ++-- pkgs/servers/mail/opensmtpd/default.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index af4e887d1677..025d216910ea 100644 --- a/pkgs/applications/audio/minimodem/default.nix +++ b/pkgs/applications/audio/minimodem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, linbpulseaudio }: +{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }: stdenv.mkDerivation rec { version = "0.19"; diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix index 101dbb8cc488..9dbd46946c00 100644 --- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacerts }: +{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacert }: stdenv.mkDerivation rec { name = "rest-0.7.92"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - configureFlags = "--with-ca-certificates=${cacerts}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index a22da36d2b6e..ab8ec59ca8cb 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, bison -, libasr, libevent, zlib, openssl, db, pam +, libasr, libevent, zlib, openssl, db, pam, cacert }: stdenv.mkDerivation rec { From be5f4082fd817703e5ee17a2ebd2629811a56100 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 14:38:53 -0700 Subject: [PATCH 127/127] pulseaudio: Remove default derivation --- pkgs/applications/kde-apps-15.04/default.nix | 2 +- pkgs/desktops/plasma-5.3/default.nix | 2 +- pkgs/games/steam/chrootenv.nix | 2 +- pkgs/misc/emulators/wine/staging.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 9cab1775c425..661c8c3acb58 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -117,7 +117,7 @@ let OpenEXR = openexr; Poppler = poppler_qt4; Prison = prison; - PulseAudio = pulseaudio; + PulseAudio = libpulseaudio; PythonLibrary = python; Qalculate = libqalculate; QCA2 = qca2; diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index 7ff2d5fe8156..c4fb624a3771 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -53,7 +53,7 @@ let GTK3 = gtk3; Libinput = libinput; LibSSH = libssh; - PulseAudio = pulseaudio; + PulseAudio = libpulseaudio; Taglib = taglib; USB = libusb; Wayland = wayland; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index b8e5c6467584..1876e81dc315 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -56,7 +56,7 @@ buildFHSUserEnv { pkgs.alsaLib pkgs.libvorbis pkgs.openal - pkgs.pulseaudio + pkgs.libpulseaudio pkgs.flashplayer diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index beea0bb3c125..1de37f56504b 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -15,7 +15,7 @@ let v = (import ./versions.nix).staging; in assert (builtins.parseDrvName wine.name).version == version; stdenv.lib.overrideDerivation wine (self: { - nativeBuildInputs = build-inputs [ "pulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; + nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; name = "${self.name}-staging"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebd50429c540..6c0e785846a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8794,7 +8794,9 @@ let prefix = "lib"; }; - pulseaudio = pulseaudioFull.override { + # Name is changed to prevent use in packages + # please use libpulseaudio instead + pulseaudioLight = pulseaudioFull.override { # The following are disabled in the default build, because if this # functionality is desired, they are only needed in the PulseAudio # server.