diff options
Diffstat (limited to 'pkgs/development/tools')
8 files changed, 49 insertions, 81 deletions
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index d8557bfcbc27..599e10af1a9a 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,31 +1,37 @@ { stdenv, lib, fetchgit, darwin, writeText -, git, ninja, python3 }: +, ninja, python3 +}: let - rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; - sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy"; + # Note: Please use the recommended version for Chromium, e.g.: + # https://git.archlinux.org/svntogit/packages.git/tree/trunk/chromium-gn-version.sh?h=packages/gn + rev = "fd3d768bcfd44a8d9639fe278581bd9851d0ce3a"; + revNum = "1718"; # git describe HEAD --match initial-commit | cut -d- -f3 + version = "2020-03-09"; + sha256 = "1asc14y8by7qcn10vbk467hvx93s30pif8r0brissl0sihsaqazr"; - shortRev = builtins.substring 0 7 rev; + revShort = builtins.substring 0 7 rev; lastCommitPosition = writeText "last_commit_position.h" '' #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION "(${shortRev})" + #define LAST_COMMIT_POSITION_NUM ${revNum} + #define LAST_COMMIT_POSITION "${revNum} (${revShort})" #endif // OUT_LAST_COMMIT_POSITION_H_ ''; -in -stdenv.mkDerivation { - pname = "gn"; - version = "20190403"; +in stdenv.mkDerivation { + pname = "gn-unstable"; + inherit version; src = fetchgit { + # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic! url = "https://gn.googlesource.com/gn"; inherit rev sha256; }; - nativeBuildInputs = [ ninja python3 git ]; + nativeBuildInputs = [ ninja python3 ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc cctools @@ -49,8 +55,8 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = with lib; { - description = "A meta-build system that generates NinjaBuild files"; - homepage = https://gn.googlesource.com/gn; + description = "A meta-build system that generates build files for Ninja"; + homepage = "https://gn.googlesource.com/gn"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ stesie matthewbauer ]; diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 740d04d853f7..41ac16bed7a1 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,25 +1,22 @@ { version, sha256 }: -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages, python2Packages, scons }: -let name = "scons"; -in python2Packages.buildPythonApplication { - name = "${name}-${version}"; +python3Packages.buildPythonApplication rec { + pname = "scons"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/scons/${pname}-${version}.tar.gz"; inherit sha256; }; - # Fix a regression in 3.0.0 (causes build errors for some packages) - patches = stdenv.lib.optional (version == "3.0.0") ./print-statements.patch; - setupHook = ./setup-hook.sh; + passthru.py2 = scons.override { python3Packages = python2Packages; }; + meta = with stdenv.lib; { - homepage = http://scons.org/; description = "An improved, cross-platform substitute for Make"; - license = licenses.mit; longDescription = '' SCons is an Open Source software construction tool. Think of SCons as an improved, cross-platform substitute for the classic @@ -28,6 +25,9 @@ in python2Packages.buildPythonApplication { SCons is an easier, more reliable and faster way to build software. ''; + homepage = "https://scons.org/"; + changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; + license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.primeos ]; }; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 0afe2fbe9281..19b092b86bab 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,12 +1,12 @@ -{ callPackage }: +{ callPackage, python2Packages }: let mkScons = args: callPackage (import ./common.nix args) { }; in { - scons_3_0_1 = mkScons { + scons_3_0_1 = (mkScons { version = "3.0.1"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; - }; + }).override { python3Packages = python2Packages; }; scons_latest = mkScons { version = "3.1.2"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; diff --git a/pkgs/development/tools/build-managers/scons/print-statements.patch b/pkgs/development/tools/build-managers/scons/print-statements.patch deleted file mode 100644 index a963bf78abab..000000000000 --- a/pkgs/development/tools/build-managers/scons/print-statements.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py -index 558e28f9..8fea9c4d 100644 ---- src/engine/SCons/Script/SConscript.py -+++ src/engine/SCons/Script/SConscript.py -@@ -5,8 +5,6 @@ - - """ - --from __future__ import print_function -- - # - # __COPYRIGHT__ - # diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 38998e8db340..439350c3abc2 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -11,17 +11,23 @@ wafConfigurePhase() { fi local flagsArray=( - @crossFlags@ "${flagsArray[@]}" $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) + if [ -z "${dontAddWafCrossFlags:-}" ]; then + flagsArray+=(@crossFlags@) + fi echoCmd 'configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" runHook postConfigure } +if [ -z "${dontUseWafConfigure-}" -a -z "${configurePhase-}" ]; then + configurePhase=wafConfigurePhase +fi + wafBuildPhase () { runHook preBuild @@ -41,6 +47,10 @@ wafBuildPhase () { runHook postBuild } +if [ -z "${dontUseWafBuild-}" -a -z "${buildPhase-}" ]; then + buildPhase=wafBuildPhase +fi + wafInstallPhase() { runHook preInstall @@ -51,7 +61,7 @@ wafInstallPhase() { local flagsArray=( $wafFlags ${wafFlagsArray[@]} $installFlags ${installFlagsArray[@]} - ${installTargets:-install} + ${installTargets:-install} ) echoCmd 'install flags' "${flagsArray[@]}" @@ -60,6 +70,6 @@ wafInstallPhase() { runHook postInstall } -configurePhase=wafConfigurePhase -buildPhase=wafBuildPhase -installPhase=wafInstallPhase +if [ -z "${dontUseWafInstall-}" -a -z "${installPhase-}" ]; then + installPhase=wafInstallPhase +fi diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 06f1e2895c02..7d6f3758fd5b 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -28,41 +28,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # This program does not cross-build fine. So I only cross-build some parts - # I need for the linux perf tool. - # On the awful cross-building: - # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005 - # - # I wrote this testing for the nanonote. - - buildPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - pushd libebl - make - popd - pushd libelf - make - popd - pushd libdwfl - make - popd - pushd libdw - make - popd - ''; - - installPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - pushd libelf - make install - popd - pushd libdwfl - make install - popd - pushd libdw - make install - popd - cp version.h $out/include - ''; - doCheck = false; # fails 3 out of 174 tests doInstallCheck = false; # fails 70 out of 174 tests diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 683d07ed4964..ea6203e57c31 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { chmod -R u+w $out/share/nsis ''; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ scons.py2 ]; buildInputs = [ zlib ]; sconsFlags = [ diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index b7538a2b388f..da2043c5bd70 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.34.1"; + version = "3.36.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l4kr1av7933vb4zql9c5lgzivlw64hyky4nr8xin1v5if6vnjw4"; + sha256 = "hnDbTaz3shnTDFdcRlsXyO1nJNut40fyzelUi/8DkQg="; }; nativeBuildInputs = [ |