diff options
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/cquery/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/misc/ltrace/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/tools/misc/saleae-logic/default.nix | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 09220b2dc65..bf979767126 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -5,8 +5,8 @@ let src = fetchFromGitHub { owner = "cquery-project"; repo = "cquery"; - rev = "e45a9ebbb6d8bfaf8bf1a3135b6faa910afea37e"; - sha256 = "049gkqbamq4r2nz9yjcwq369zrmwrikzbhfza2x2vndqzaavq5yg"; + rev = "34b357bc5e873d52d2aa41287c6e138244cea109"; + sha256 = "0i34v30cl73485bzpbis539x0iq9whpv0403ca5a9h6vqwnvdn7c"; fetchSubmodules = true; }; @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { name = "cquery-${version}"; - version = "2018-03-25"; + version = "2018-05-01"; inherit src; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' pushd ${src} - $out/bin/cquery --ci --clang-sanity-check && \ $out/bin/cquery --ci --test-unit ''; @@ -56,6 +55,5 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.tobim ]; - priority = 3; }; } diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 66fbed514dc..15eac37a53a 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -10,10 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ elfutils libunwind ]; - preConfigure = - '' - configureFlags="--disable-werror" - makeFlagsArray=(INSTALL="install -c") + prePatch = let + debian = fetchurl { + url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz; + sha256 = "0xc4pfd8qw53crvdxr29iwl8na53zmknca082kziwpvlzsick4kp"; + }; + in '' + tar xf '${debian}' + patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index de2d6c5b7bf..a8183aa4ba0 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -21,8 +21,6 @@ let in -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { pname = "saleae-logic"; version = "1.2.10"; @@ -93,7 +91,7 @@ stdenv.mkDerivation rec { description = "Software for Saleae logic analyzers"; homepage = http://www.saleae.com/; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.bjornfor ]; }; } |