diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-08-28 21:27:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 21:27:01 +0100 |
| commit | 35a9538d16c83ca8444442db0680e0c31c4d932e (patch) | |
| tree | 773b1d153bc590cf87471159b667f740bcdb0659 | |
| parent | 8324397af5a3c9f06f7e33cdc576b58c9c1caa78 (diff) | |
| parent | 0da61beee937f7c22b8c609bc645d54fd4876465 (diff) | |
| download | nixpkgs-35a9538d16c83ca8444442db0680e0c31c4d932e.tar nixpkgs-35a9538d16c83ca8444442db0680e0c31c4d932e.tar.gz nixpkgs-35a9538d16c83ca8444442db0680e0c31c4d932e.tar.bz2 nixpkgs-35a9538d16c83ca8444442db0680e0c31c4d932e.tar.lz nixpkgs-35a9538d16c83ca8444442db0680e0c31c4d932e.tar.xz nixpkgs-35a9538d16c83ca8444442db0680e0c31c4d932e.tar.zst nixpkgs-35a9538d16c83ca8444442db0680e0c31c4d932e.zip | |
Merge pull request #28648 from bkchr/xxdiff_tip_new_version
xxdiff-tip: 20170101 -> 20170623
| -rw-r--r-- | pkgs/development/tools/misc/xxdiff/tip.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index b613508c5c0..f05988e7026 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchFromBitbucket, qt5, flex, bison, docutils }: +{ stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }: stdenv.mkDerivation rec { - name = "xxdiff-4.0.1.20170101"; + name = "xxdiff-4.0.1.20170623"; src = fetchFromBitbucket { owner = "blais"; repo = "xxdiff"; - rev = "1cf6b23ad30a845daba28a3409c65f93aec7f5e8"; - sha256 = "0rq7grpndj85i7qzlj93jpzpfzk7bwsi55033fc63hb55rbdzz6z"; + rev = "5e5f885dfc43559549a81c59e9e8c9525306356a"; + sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w"; }; - nativeBuildInputs = [ flex bison qt5.qtbase docutils ]; + nativeBuildInputs = [ flex bison docutils ]; - buildInputs = [ qt5.qtbase ]; + buildInputs = [ qtbase ]; preConfigure = '' - ln -s ${qt5.qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs - ln -s ${qt5.qtbase.dev}/bin/* ../__nix_qt*__/bin || true + ln -s ${qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs + ln -s ${qtbase.dev}/bin/* ../__nix_qt*__/bin || true ''; - NIX_CFLAGS_COMPILE="-I${qt5.qtbase.dev}/include/QtCore -I${qt5.qtbase.dev}/include/QtGui -I${qt5.qtbase.dev}/include/QtWidgets"; + NIX_CFLAGS_COMPILE="-I${qtbase.dev}/include/QtCore -I${qtbase.dev}/include/QtGui -I${qtbase.dev}/include/QtWidgets"; configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fb97035794..469000ba931 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7443,7 +7443,7 @@ with pkgs; xxdiff = callPackage ../development/tools/misc/xxdiff { bison = bison2; }; - xxdiff-tip = callPackage ../development/tools/misc/xxdiff/tip.nix { }; + xxdiff-tip = qt56.callPackage ../development/tools/misc/xxdiff/tip.nix { }; yacc = bison; |