Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1bb56de88b61
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 092a835bab9c
Choose a head ref
  • 6 commits
  • 1 file changed
  • 3 contributors

Commits on Oct 23, 2019

  1. boomerang: 0.4.0-alpha-2018-10-25 -> 0.5.0 

    https://github.com/BoomerangDecompiler/boomerang/releases/tag/v0.5.0
    @dtzWill
    dtzWill committed Oct 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4fca420 View commit details

  2. boomerang: remove deprecated fixups/workarounds 

    If they're still needed they should be reworked so they apply :)
    @dtzWill
    dtzWill committed Oct 23, 2019
    Copy the full SHA
    32d132a View commit details

  3. boomerang: 0.5.0 -> 0.5.1

    @dtzWill
    dtzWill committed Oct 23, 2019
    Copy the full SHA
    6c275a5 View commit details

  4. boomerang: use qt's mkDerivation

    @dtzWill
    dtzWill committed Oct 23, 2019
    Copy the full SHA
    2250538 View commit details

Commits on Oct 24, 2019

  1. boomerang: be less verbose/explicit, save for problematic upstream 

    Co-Authored-By: Jon <jonringer@users.noreply.github.com>
    @dtzWill
    dtzWill and Jon authored Oct 24, 2019
    Copy the full SHA
    472832f View commit details

  2. Merge pull request #71833 from dtzWill/update/boomerang-0.5.1 

    boomerang: 0.4.X -> 0.5.1, various fixes and cleanups
    @dtzWill
    dtzWill authored Oct 24, 2019
    Copy the full SHA
    092a835 View commit details
Showing with 11 additions and 29 deletions.
  1. +11 −29 pkgs/development/tools/boomerang/default.nix
40 changes: 11 additions & 29 deletions pkgs/development/tools/boomerang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,23 @@
{ stdenv, fetchFromGitHub, cmake, qtbase }:
{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, capstone, bison, flex }:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "boomerang";
version = "0.4.0-alpha-2018-07-03";
version = "0.5.1";

src = fetchFromGitHub {
owner = "ceeac";
repo = "boomerang";
rev = "377ff2d7db93d892c925e2d3e61aef818371ce7d";
sha256 = "1ljbyj3b8xckr1wihyii3h576zgq0q88vli0ylpr3p4jxy5sm57j";
owner = "BoomerangDecompiler";
repo = pname;
rev = "v${version}";
sha256 = "046ba4km8c31kbnllx05nbqhjmk7bpi56d3n8md8bsr98nj21a2j";
};

nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase ];

postPatch =
# Look in installation directory for required files, not relative to working directory
''
substituteInPlace src/boomerang/core/Settings.cpp \
--replace "setDataDirectory(\"../share/boomerang\");" \
"setDataDirectory(\"$out/share/boomerang\");" \
--replace "setPluginDirectory(\"../lib/boomerang/plugins\");" \
"setPluginDirectory(\"$out/lib/boomerang/plugins\");"
''
# Fixup version:
# * don't try to inspect with git
# (even if we kept .git and such it would be "dirty" because of patching)
# * use date so version is monotonically increasing moving forward
+ ''
sed -i cmake-scripts/boomerang-version.cmake \
-e 's/set(\(PROJECT\|BOOMERANG\)_VERSION ".*")/set(\1_VERSION "${version}")/'
'';
nativeBuildInputs = [ cmake bison flex ];
buildInputs = [ qtbase capstone ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = http://boomerang.sourceforge.net/;
meta = with lib; {
homepage = https://github.com/BoomerangDecompiler/boomerang;
license = licenses.bsd3;
description = "A general, open source, retargetable decompiler";
maintainers = with maintainers; [ dtzWill ];