diff options
Diffstat (limited to 'pkgs/development/tools')
7 files changed, 159 insertions, 13 deletions
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix new file mode 100644 index 000000000000..7d89555085d7 --- /dev/null +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "liquibase"; + version = "3.4.2"; + + src = fetchurl { + url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; + sha256 = "1kvxqjz8jmqpmb1clhp2asxmgfk6ynqjir8fldc321v9a5wnqby5"; + }; + + buildInputs = [ jre makeWrapper ]; + + unpackPhase = '' + tar xfz ${src} + ''; + + installPhase = '' + mkdir -p $out/{bin,lib,sdk} + mv ./* $out/ + wrapProgram $out/liquibase --prefix PATH ":" ${jre}/bin --set LIQUIBASE_HOME $out; + ln -s $out/liquibase $out/bin/liquibase + ''; + + meta = with stdenv.lib; { + description = "Version Control for your database"; + homepage = "http://www.liquibase.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix index 87dc173dd878..724942c57c83 100644 --- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "cabal2nix"; - version = "20160308"; + version = "20160406"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; + sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix index 5aa4370b26f9..870f3d40961e 100644 --- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -11,8 +11,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; - rev = "v20160308"; - sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; + rev = "v20160406"; + sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6"; }; postUnpack = "sourceRoot+=/${pname}"; libraryHaskellDepends = [ diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix index ce1d9303cdcd..461cf464f454 100644 --- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "hackage2nix"; - version = "20160308"; + version = "20160406"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; + sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 8dcae46f1080..9992e2f6e059 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation rec { # Bug fix backported from binutils master. ./fix-bsymbolic.patch + + # Bug fix backported from binutils master. + ./fix-update-symbol-version.patch ]; outputs = [ "out" "info" ]; diff --git a/pkgs/development/tools/misc/binutils/fix-update-symbol-version.patch b/pkgs/development/tools/misc/binutils/fix-update-symbol-version.patch new file mode 100644 index 000000000000..ca7dcf969f37 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/fix-update-symbol-version.patch @@ -0,0 +1,106 @@ +NOTE: removed Changelog diffs to avoid the patch failing to apply + +From 544ddf9322b1b83982e5cb84a54d084ee7e718ea Mon Sep 17 00:00:00 2001 +From: H.J. Lu <hjl.tools@gmail.com> +Date: Wed, 24 Feb 2016 15:13:35 -0800 +Subject: [PATCH] Update symbol version for symbol from linker script + +We need to update symbol version for symbols from linker script. + +Backport from master + +bfd/ + + PR ld/19698 + * elflink.c (bfd_elf_record_link_assignment): Set versioned if + symbol version is unknown. + +ld/ + + PR ld/19698 + * testsuite/ld-elf/pr19698.d: New file. + * testsuite/ld-elf/pr19698.s: Likewise. + * testsuite/ld-elf/pr19698.t: Likewise. +--- + bfd/ChangeLog | 9 +++++++++ + bfd/elflink.c | 13 +++++++++++++ + ld/ChangeLog | 10 ++++++++++ + ld/testsuite/ld-elf/pr19698.d | 10 ++++++++++ + ld/testsuite/ld-elf/pr19698.s | 5 +++++ + ld/testsuite/ld-elf/pr19698.t | 11 +++++++++++ + 6 files changed, 58 insertions(+), 0 deletions(-) + create mode 100644 ld/testsuite/ld-elf/pr19698.d + create mode 100644 ld/testsuite/ld-elf/pr19698.s + create mode 100644 ld/testsuite/ld-elf/pr19698.t + +diff --git a/bfd/elflink.c b/bfd/elflink.c +index ae8d148..8fcaadd 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -555,6 +555,19 @@ bfd_elf_record_link_assignment (bfd *output_bfd, + if (h == NULL) + return provide; + ++ if (h->versioned == unknown) ++ { ++ /* Set versioned if symbol version is unknown. */ ++ char *version = strrchr (name, ELF_VER_CHR); ++ if (version) ++ { ++ if (version > name && version[-1] != ELF_VER_CHR) ++ h->versioned = versioned_hidden; ++ else ++ h->versioned = versioned; ++ } ++ } ++ + switch (h->root.type) + { + case bfd_link_hash_defined: +diff --git a/ld/testsuite/ld-elf/pr19698.d b/ld/testsuite/ld-elf/pr19698.d +new file mode 100644 +index 0000000..a39f67a +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr19698.d +@@ -0,0 +1,10 @@ ++#ld: -shared $srcdir/$subdir/pr19698.t ++#readelf : --dyn-syms --wide ++#target: *-*-linux* *-*-gnu* *-*-solaris* ++ ++Symbol table '\.dynsym' contains [0-9]+ entries: ++#... ++ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +foo@VERS.1 ++#... ++ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +foo@@VERS.2 ++#pass +diff --git a/ld/testsuite/ld-elf/pr19698.s b/ld/testsuite/ld-elf/pr19698.s +new file mode 100644 +index 0000000..875dca4 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr19698.s +@@ -0,0 +1,5 @@ ++ .text ++ .globl foo ++ .type foo, %function ++foo: ++ .byte 0 +diff --git a/ld/testsuite/ld-elf/pr19698.t b/ld/testsuite/ld-elf/pr19698.t +new file mode 100644 +index 0000000..09d9125 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr19698.t +@@ -0,0 +1,11 @@ ++"foo@VERS.1" = foo; ++ ++VERSION { ++VERS.2 { ++ global: ++ foo; ++}; ++ ++VERS.1 { ++}; ++} +-- +1.7.1 + diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index a0f919b404f3..e5af795fa4b7 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, +{ stdenv, fetchgit, bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite, darwin, writeScriptBin, cups }: @@ -33,11 +33,13 @@ let in stdenv.mkDerivation rec { name = "phantomjs-${version}"; - version = "2.0.0-20150528"; + version = "2.1.1"; - src = fetchurl { - url = "https://github.com/bprodoehl/phantomjs/archive/v2.0.0-20150528.tar.gz"; - sha256 = "18h37bxxg25lacry9k3vb5yim057bqcxmsifw97jrjp7gzfx56v5"; + # needs git submodules, so can't use fetchFromGitHub + src = fetchgit { + rev = "refs/tags/${version}"; + url = "https://github.com/ariya/phantomjs.git"; + sha256 = "16x104cw5f1dyhf7fg12vlpcywvc9c43r9afhl0dvssgxklrn0q7"; }; buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ] @@ -49,7 +51,8 @@ in stdenv.mkDerivation rec { patchPhase = '' patchShebangs . - sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure + sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure + touch src/qt/{qtbase,qtwebkit,3rdparty}/.git '' + stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's,-licucore,/usr/lib/libicucore.dylib,' src/qt/qtwebkit/Source/WTF/WTF.pri substituteInPlace src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.pri \ @@ -78,7 +81,9 @@ in stdenv.mkDerivation rec { __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; - buildPhase = "./build.sh --confirm"; + buildPhase = "./build.py --confirm -j$NIX_BUILD_CORES"; + + enableParallelBuilding = true; installPhase = '' mkdir -p $out/share/doc/phantomjs |