diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-03 09:48:58 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-03 09:48:58 +0200 |
commit | d1a89ae9d702a4b91b6d661af256552e330bb995 (patch) | |
tree | b34b95d1204ad7b4423b10cf1572d11b3293319f /pkgs/development/tools/misc | |
parent | 343ad1697d6967b7aa949752fd5c4471f691b4eb (diff) | |
parent | 0b1c8793fc20944b68562d9a73a5ce391f1603e0 (diff) | |
download | nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.gz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.bz2 nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.lz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.xz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.zst nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/ccache/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch | 43 | ||||
-rw-r--r-- | pkgs/development/tools/misc/gede/build.patch | 11 | ||||
-rw-r--r-- | pkgs/development/tools/misc/gede/default.nix | 30 | ||||
-rw-r--r-- | pkgs/development/tools/misc/yodl/default.nix | 4 |
5 files changed, 67 insertions, 28 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 99348e907a94..765fdfb2ea45 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,15 +2,18 @@ let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.2.5"; + version = "3.3.4"; src = fetchurl { - sha256 = "11db1g109g0g5si0s50yd99ja5f8j4asxb081clvx78r9d9i2w0i"; + sha256 = "0ks0vk408mdppfbk8v38p46fqx3p30r9a9cwiia43373i7rmpw94"; url = "mirror://samba/ccache/${name}.tar.xz"; }; buildInputs = [ zlib ]; + # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) + patches = [ ./skip-fs-dependent-test.patch ]; + postPatch = '' substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' ''; diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch new file mode 100644 index 000000000000..ecd3c4c9a74e --- /dev/null +++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch @@ -0,0 +1,43 @@ +--- ccache-3.3.4.org/test.sh 2017-02-17 21:28:53.000000000 +0000 ++++ ccache-3.3.4/test.sh 2017-07-01 18:38:00.523403023 +0100 +@@ -2631,23 +2631,23 @@ + $CCACHE -F 0 -M 256K >/dev/null + $CCACHE -c >/dev/null + # floor(0.8 * 4) = 3 +- expect_file_count 3 '*.o' $CCACHE_DIR +- expect_file_count 3 '*.d' $CCACHE_DIR +- expect_file_count 3 '*.stderr' $CCACHE_DIR +- expect_stat 'files in cache' 9 +- expect_stat 'cleanups performed' 1 +- for i in 3 4 5; do +- file=$CCACHE_DIR/a/result$i-4017.o +- if [ ! -f $file ]; then +- test_failed "File $file removed when it shouldn't" +- fi +- done +- for i in 0 1 2 6 7 8 9; do +- file=$CCACHE_DIR/a/result$i-4017.o +- if [ -f $file ]; then +- test_failed "File $file not removed when it should" +- fi +- done ++ #expect_file_count 3 '*.o' $CCACHE_DIR ++ #expect_file_count 3 '*.d' $CCACHE_DIR ++ #expect_file_count 3 '*.stderr' $CCACHE_DIR ++ #expect_stat 'files in cache' 9 ++ #expect_stat 'cleanups performed' 1 ++ #for i in 3 4 5; do ++ # file=$CCACHE_DIR/a/result$i-4017.o ++ # if [ ! -f $file ]; then ++ # test_failed "File $file removed when it shouldn't" ++ # fi ++ #done ++ #for i in 0 1 2 6 7 8 9; do ++ # file=$CCACHE_DIR/a/result$i-4017.o ++ # if [ -f $file ]; then ++ # test_failed "File $file not removed when it should" ++ # fi ++ #done + + # ------------------------------------------------------------------------- + TEST "Automatic cache cleanup" diff --git a/pkgs/development/tools/misc/gede/build.patch b/pkgs/development/tools/misc/gede/build.patch deleted file mode 100644 index bdd8b7ff5f96..000000000000 --- a/pkgs/development/tools/misc/gede/build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build.py 2017-01-16 21:12:43.000000000 +0100 -+++ b/build.py 2017-02-26 22:03:11.394625315 +0100 -@@ -71,7 +71,7 @@ - if do_build: - if not os.path.exists("Makefile"): - print("Generating makefile") -- if subprocess.call(['qmake-qt4']): -+ if subprocess.call(['qmake']): - exit(1) - - print("Compiling (please wait)") diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 5667e496a70a..24f099a15337 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,24 +1,29 @@ -{stdenv, fetchurl, ctags, qt4, python}: +{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }: stdenv.mkDerivation rec { - - version = "2.0.3"; name = "gede-${version}"; + version = "2.0.4"; + src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "1znlmkjgrmjl79q73xaa9ybp1xdc3k4h4ynv3jj5z8f92gjnj3kk"; + sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba"; }; - buildInputs = [ ctags qt4 python ]; - patches = [ ./build.patch ]; + nativeBuildInputs = [ makeWrapper python ]; - unpackPhase = '' - tar xf ${src} - cd ${name} + buildInputs = [ qt4 ]; + + postPatch = '' + sed -i build.py -e 's,qmake-qt4,qmake,' + ''; + + buildPhase = ":"; + + installPhase = '' + python build.py install --prefix="$out" + wrapProgram $out/bin/gede \ + --prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]} ''; - configurePhase = ""; - buildPhase = ""; - installPhase = "./build.py install --prefix=$out"; meta = with stdenv.lib; { description = "Graphical frontend (GUI) to GDB"; @@ -28,4 +33,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ juliendehos ]; }; } - diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 84e57e267c2f..1eed4c2ad862 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "yodl-${version}"; - version = "3.08.02"; + version = "4.01.00"; nativeBuildInputs = [ icmake ]; buildInputs = [ perl ]; src = fetchFromGitHub { - sha256 = "0z4pjrl4bq03fxc50c9h0bnc90vqn5c2dy830mjyzjrn1ms3i003"; + sha256 = "1aahwmj4gmf59lrij2373lkgfj77i3ghdas9c7iqrjwaizb0430p"; rev = version; repo = "yodl"; owner = "fbb-git"; |