diff options
Diffstat (limited to 'pkgs/development')
31 files changed, 131 insertions, 113 deletions
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 2135e75a07ac..9d9eb42b0649 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20150315"; + version = "20150609"; src = fetchurl { url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "1vzwyhpqbrndg7mri81f1b2yi8cshw5pghvdda9vdxgq465sa52f"; + sha256 = "0347j50kg41agrvpb29vp69ra912ljhp206z9kbrk84lxpmx19rp"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 094df5b5b631..629d981893d9 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dotnet.github.io/core/; description = ".NET is a general purpose development platform."; - platforms = with stdenv.lib.platforms; linux; + platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ obadz ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index ebbac8ec3553..f68681e60232 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -46,7 +46,7 @@ edk2 = stdenv.mkDerivation { configurePhase = '' mkdir -v Conf sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \ - 's|MYTOOLS|GCC48|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\ + 's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\ < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt sed -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \ -e 's|DEFINE GCC48_X64_PREFIX = /usr/bin/|DEFINE GCC48_X64_PREFIX = ""|' \ diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 92d80deb532e..11bae06fc749 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "fsharp-${version}"; - version = "3.1.1.32"; + version = "3.1.2.5"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "16kqgdx0y0lmxv59mc4g7l5ll60nixg5b8bg07vxfnqrf7i6dffd"; + sha256 = "1j6lnzvhj8fj1csb9am9xcrmmph6v3jyangkq8n1yp3dr6yxqzh1"; }; buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ]; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 14641faa5fec..9069387762fd 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -320,7 +320,7 @@ stdenv.mkDerivation ({ " --with-gnu-as --without-gnu-ld " else ""} --enable-lto - ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"} + ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if enablePlugin then "--enable-plugin" else "--disable-plugin"} ${optionalString (isl != null) "--with-isl=${isl}"} diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 5e6acea35dfc..46864c0bb029 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -318,7 +318,7 @@ stdenv.mkDerivation ({ " --with-gnu-as --without-gnu-ld " else ""} --enable-lto - ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"} + ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if enablePlugin then "--enable-plugin" else "--disable-plugin"} ${optionalString (isl != null) "--with-isl=${isl}"} diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/1.0.nix index b35159c10e79..b16ce93a3c56 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/1.0.nix @@ -90,6 +90,6 @@ stdenv.mkDerivation { description = "The Go Programming language"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [ pierron viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index bbedea812b8d..7aaedcb365df 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation { description = "The Go Programming language"; license = licenses.bsd3; maintainers = with maintainers; [ pierron viric ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 66939ff1a026..3082a53137b8 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -6,13 +6,15 @@ let in stdenv.mkDerivation rec { name = "mono-${version}"; - version = "4.0.1"; + version = "4.0.2.5"; src = fetchurl { url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; - sha256 = "1kjv1zhcmd2qfr89vkaas6541n5jfzisn3y030l6lg6lp3ria7zz"; + sha256 = "0lfndz7l3j593wilyczb5w6kvrdbf2fsd1i46qlszfjvx975hx5h"; }; - buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib]; + buildInputs = + [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib + ]; propagatedBuildInputs = [glib]; NIX_LDFLAGS = "-lgcc_s" ; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 837fa79859d4..0ec01cebf499 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -891,4 +891,6 @@ self: super: { # Hydra no longer allows building texlive packages. lhs2tex = dontDistribute super.lhs2tex; + # https://ghc.haskell.org/trac/ghc/ticket/9825 + vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }); } diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index 143bab575347..a4eb7439b0d5 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -114,6 +114,7 @@ let isPypy = true; buildEnv = callPackage ../python/wrapper.nix { python = self; }; interpreter = "${self}/bin/${executable}"; + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; # almost no parallelization without STM diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 98b4f55f79b8..ad2bf945f966 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,26 +1,22 @@ -{stdenv, fetchurl}: - -let - pname = "scsh"; - version = "0.6.7"; - name = "${pname}-${version}"; -in +{ stdenv, fetchgit, autoconf, automake, autoreconfHook, scheme48 }: stdenv.mkDerivation { - inherit name; + name = "scsh-0.7pre"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "c4a9f7df2a0bb7a7aa3dafc918aa9e9a566d4ad33a55f0192889de172d1ddb7f"; + src = fetchgit { + url = "git://github.com/scheme/scsh.git"; + rev = "f99b8c5293628cfeaeb792019072e3a96841104f"; + fetchSubmodules = true; + sha256 = "0fz1r0bmiii9ld91r84dqkqwhnqk0h6drdycq93zcy5ndyn12fqp"; }; - meta = { + buildInputs = [ autoconf automake autoreconfHook scheme48 ]; + configureFlags = ''--with-scheme48=${scheme48}''; + + meta = with stdenv.lib; { description = "A Scheme shell"; - longDescription = '' - SCSH is an implementation of the Scheme shell. It is implemented as - a heap image which is interpreted by the Scheme 48 virtual machine. - ''; homepage = http://www.scsh.net/; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ joachifm ]; }; } diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 38dfce7583a7..2a9ee1c9c5bd 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline +{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline , utillinux, yodl }: let version = "3.25.02"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ]; + buildInputs = [ libmilter libX11 openssl readline utillinux ]; nativeBuildInputs = [ icmake yodl ]; postPatch = '' diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index d61c82bb7d3b..a72532ee35bc 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,21 +1,16 @@ -{ stdenv, fetchurl, bash }: +{ stdenv, fetchurl, bash, cmake }: stdenv.mkDerivation rec { name = "capstone-${version}"; - version = "2.1.2"; + version = "3.0.4"; src = fetchurl { - url = "http://www.capstone-engine.org/download/${version}/${name}.tgz"; - sha256 = "1k6px3vdcsfby3lakss5sazs875kbzkzqk7cj79xrm2y5ik1vr29"; + url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; + sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"; }; - buildPhase = false; - - patchPhase = '' - substituteInPlace make.sh --replace "/usr/bin/env bash" "${bash}/bin/bash" - ''; - - installPhase = "PREFIX=$out ./make.sh install"; + buildInputs = [ cmake ]; + enableParallelBuild = true; meta = { description = "advanced disassembly library"; diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix index 1489f48c9b46..5eb12fe29989 100644 --- a/pkgs/development/libraries/cogl/1.20.nix +++ b/pkgs/development/libraries/cogl/1.20.nix @@ -18,10 +18,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-introspection" - "--enable-gles1" - "--enable-gles2" "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; + ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 5c76bc3186ba..fb9c361c5306 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -93,6 +93,8 @@ stdenv.mkDerivation rec { sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c # All gschemas fail to pass the test, upstream bug? sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c + # Cannot reproduce the failing test_associations on hydra + sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c # Needed because of libtool wrappers sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c ''; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 61f22701111c..af9f017ac739 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "seccomp"; repo = "libseccomp"; rev = "v${version}"; - sha256 = "153k3jflcgij19nxghmwlvqlngl84vkld514d31490c6sfkr5fy2"; + sha256 = "0pl827qjls5b6kjj8qxxdwcn6rviqbm5xjqf0hgx6b04c836mswx"; }; buildInputs = [ autoreconfHook getopt ]; diff --git a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch deleted file mode 100644 index 030983d5c55e..000000000000 --- a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001 -From: Mike DePaulo <mikedep333@gmail.com> -Date: Fri, 15 May 2015 22:22:13 -0400 -Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194) - ---- - src/channels.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/channels.c b/src/channels.c -index 7a4e71f..db5f83a 100644 ---- a/src/channels.c -+++ b/src/channels.c -@@ -2206,6 +2206,11 @@ error: - } - - /* DEPRECATED */ -+int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) { -+ return ssh_channel_listen_forward(session, address, port, bound_port); -+} -+ -+/* DEPRECATED */ - ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) { - return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL); - } --- -2.1.4 - diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index ef4540db2b2e..1766a685aaab 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.7.0"; + name = "libssh-0.7.1"; src = fetchurl { - url = "https://git.libssh.org/projects/libssh.git/snapshot/${name}.tar.gz"; - sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0"; + url = "https://red.libssh.org/attachments/download/154/libssh-0.7.1.tar.xz"; + sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrirg"; }; - patches = [ ./0001-Reintroduce-ssh_forward_listen-Fixes-194.patch ]; - postPatch = '' # Fix headers to use libsodium instead of NaCl sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index df5917fb05cf..01ae59efdf41 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -11,4 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 zlib librevenge ]; nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "A library for importing and exporting WordPerfect documents"; + homepage = http://libwpd.sourceforge.net/; + license = licenses.lgpl21; + }; } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 4b7debda6383..f54f12031b44 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,7 +4,7 @@ , utils ? false, suffix ? "glib" }: -let +let # beware: updates often break cups_filters build version = "0.34.0"; # even major numbers are stable sha256 = "1c2wa4pfzqmvzq1jpp3ps5nmzz745gcg8dnpwqpfdccy5ydbm90v"; in diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 693f62a63ebd..14675af48fbf 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -22,6 +22,8 @@ let ver = "${v_maj}.${v_min}"; in +let system-x86_64 = elem stdenv.system platforms.x86_64; in + stdenv.mkDerivation rec { name = "qt-${ver}"; @@ -126,6 +128,16 @@ stdenv.mkDerivation rec { -no-linuxfb -no-kms + ${optionalString (!system-x86_64) "-no-sse2"} + -no-sse3 + -no-ssse3 + -no-sse4.1 + -no-sse4.2 + -no-avx + -no-avx2 + -no-mips_dsp + -no-mips_dspr2 + -system-zlib -system-libpng -system-libjpeg @@ -144,6 +156,11 @@ stdenv.mkDerivation rec { -${optionalString (buildTests == false) "no"}make tests ''; + # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag + # if dependency paths contain the string "pq", which can occur in the hash. + # To prevent these failures, we need to override PostgreSQL detection. + PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; + propagatedBuildInputs = [ xlibs.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 7ef39a408603..ecefa891332e 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -25,6 +25,8 @@ with stdenv.lib; +let system-x86_64 = elem stdenv.system platforms.x86_64; in + stdenv.mkDerivation { name = "qtbase-${version}"; @@ -104,6 +106,7 @@ stdenv.mkDerivation { -strip -reduce-relocations -system-proxies + -pkg-config -gui -widgets @@ -124,6 +127,16 @@ stdenv.mkDerivation { -no-linuxfb -no-kms + ${optionalString (!system-x86_64) "-no-sse2"} + -no-sse3 + -no-ssse3 + -no-sse4.1 + -no-sse4.2 + -no-avx + -no-avx2 + -no-mips_dsp + -no-mips_dspr2 + -system-zlib -system-libpng -system-libjpeg @@ -142,6 +155,11 @@ stdenv.mkDerivation { -${optionalString (buildTests == false) "no"}make tests ''; + # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag + # if dependency paths contain the string "pq", which can occur in the hash. + # To prevent these failures, we need to override PostgreSQL detection. + PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; + propagatedBuildInputs = [ xlibs.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre @@ -171,12 +189,11 @@ stdenv.mkDerivation { # Don't retain build-time dependencies like gdb and ruby. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri - - mkdir -p "$out/nix-support" - substitute ${./setup-hook.sh} "$out/nix-support/setup-hook" \ - --subst-var out --subst-var-by lndir "${lndir}" ''; + inherit lndir; + setupHook = ./setup-hook.sh; + enableParallelBuilding = true; # often fails on Hydra, as well as qt4 meta = { diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix index 0bafb42e2c52..7b3defb8a589 100644 --- a/pkgs/development/libraries/signon/default.nix +++ b/pkgs/development/libraries/signon/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, doxygen, qt5 }: +{ stdenv, fetchzip, doxygen, qt5 }: stdenv.mkDerivation rec { - name = "signon-8.56"; - src = fetchurl { - url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2"; - sha256 = "00kwysm7bga0bycclkcyslsa6aahcn98drm125l6brzhigc7qxa8"; + name = "signon-${version}"; + version = "8.57"; + src = fetchzip { + url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip"; + sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a"; }; buildInputs = [ qt5.base ]; @@ -14,11 +15,4 @@ stdenv.mkDerivation rec { qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5 ''; - postInstall = '' - mv $out/lib/cmake/SignOnQt5/SignOnQtConfig.cmake \ - $out/lib/cmake/SignOnQt5/SignOnQt5Config.cmake - mv $out/lib/cmake/SignOnQt5/SignOnQtConfigVersion.cmake \ - $out/lib/cmake/SignOnQt5/SignOnQt5ConfigVersion.cmake - ''; - } diff --git a/pkgs/development/python-modules/rainbowstream/image.patch b/pkgs/development/python-modules/rainbowstream/image.patch new file mode 100644 index 000000000000..215152ae4fb1 --- /dev/null +++ b/pkgs/development/python-modules/rainbowstream/image.patch @@ -0,0 +1,18 @@ +diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py +index f050150..a0fb77d 100644 +--- a/rainbowstream/c_image.py ++++ b/rainbowstream/c_image.py +@@ -12,11 +12,7 @@ def call_c(): + """ + Call the C program for converting RGB to Ansi colors + """ +- library = expanduser('~/.image.so') +- sauce = join(dirname(__file__), 'image.c') +- if not exists(library) or getmtime(sauce) > getmtime(library): +- build = "cc -fPIC -shared -o %s %s" % (library, sauce) +- os.system(build + " >/dev/null 2>&1") ++ library = '@CLIB@' + image_c = ctypes.cdll.LoadLibrary(library) + image_c.init() + return image_c.rgb_to_ansi + diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index d849ad5de944..9ffc9b0cbb99 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -11,8 +11,7 @@ buildRustPackage rec { src = fetchgit { url = "https://github.com/rust-lang/cargo.git"; rev = "refs/tags/0.3.0"; - sha256 = "1ckb2xd7nm8357imw6b1ci2ar8grnihzan94kvmjrijq6sz8yv9i"; - leaveDotGit = true; + sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793"; }; depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w"; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 5ba5d86ac77a..c1ef980e82d3 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ninja-${version}"; - version = "1.5.3"; + version = "1.6.0"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/martine/ninja/archive/v${version}.tar.gz"; - sha256 = "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw"; + sha256 = "1ryd1686bd31gfdjxnqm6k1ybnjmjz8v97px7lmdkr4g0vxqhgml"; }; buildInputs = [ python asciidoc re2c ]; diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 739cc7e5143d..38de21872b9f 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { postInstall = '' for p in $out/bin/*; do - rpath=`patchelf --print-rpath $p`:$out - patchelf --set-rpath $rpath $p + rpath=`patchelf --print-rpath $p || true`:$out + patchelf --set-rpath "$rpath" $p || true done ''; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 515fb9d251f2..d723cc0382b3 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bobcat, gcc49, icmake, yodl }: +{ stdenv, fetchurl, bobcat, icmake, yodl }: let version = "2.02.00"; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ bobcat gcc49 ]; + buildInputs = [ bobcat ]; nativeBuildInputs = [ icmake yodl ]; postPatch = '' diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index ce9941b2362b..d4b3e56ebe33 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.14.2"; + version = "0.14.3"; src = fetchurl { url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; - sha256 = "0c0w5w1dp9v9d0a6smjbnk6zvfs77fx1xd7damap3x3sjxiyn0m7"; + sha256 = "113yj5h38isfsjigqvb2j3ammfmxckgwyxmm0h4fyflzb7ghcs0w"; }; meta = { diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 97136aa255ee..085807e1bfad 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,7 +4,7 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let - version = "1.7.3"; + version = "1.7.4"; rake = buildRubyGem { inherit ruby; name = "rake-10.3.2"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb"; - sha256 = "0zg2sdxgrmwqvzqw4z8d6ji8d0cby33nggv0n9ncjxp0wjiv8nkm"; + sha256 = "0dl3cskpz7d8mmv0ah86426vlx0lj1wkjdlb5gc868dfsysw5lnw"; } else fetchurl { url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb"; - sha256 = "0r23w49jwl3c3g4nns5xnrsrqyfkqsgln91cj30hxkw50d0ldpvs"; + sha256 = "0sns9q48c6b2sabp6bwkppx8ffp774jhv69jrv225qrnifx12105"; }; meta = with stdenv.lib; { @@ -93,12 +93,12 @@ stdenv.mkDerivation rec { preFixup = '' # 'hide' the template file from shebang-patching - chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable + chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh ''; postFixup = '' - chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable + chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh ''; } |