3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1596 commits

Author SHA1 Message Date
Pascal Wittmann aa0238ece0 Merge pull request #20360 from sorokin/fix-autobuild
fix autobuild compilation
2016-11-12 14:13:24 +01:00
Vincent Laporte 72c1a6f0f4 ocamlPackages.cohttp: refactor 2016-11-12 12:41:27 +01:00
Ivan Sorokin 52ccc27c1e fix autobuild compilation
Currently autobuild failed to build in both master and release-16.03. The
error message is

   mv: cannot stat '/nix/store/a4jzlkrhd4b4nr5760caj3rrjxhyg4z3-autobuild-5.3/bin/abput-sourceforge': No such file or directory
   builder for ‘/nix/store/l19vywq8zvbarswby5h7vl4iq1c1pvq7-autobuild-5.3.drv’ failed with exit code 1

It happens in post install script

   postInstall = ''
     wrapProgram $out/bin/ab{put,build}-sourceforge \
       --prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}"
   '';

The problem is that in autobuild 5.0 the ab{put,build}-sourceforge were removed

   * Version 5.0 (released 2008-11-25)
   ...
   ** abput, abput-sourceforge, abput-testdrive: Remove.
   ** abbuild, abbuild-sourceforge: Remove.
   Both the SourceForge and TestDrive systems have been shutdown.  The
   scripts were of questionable value anyway.

Possibly the bug was introduced in commit
8c4fcc87f8320004e924f53bbaee29ae3b7b4692: autobuild: 3.5 -> 5.3.

As the package doesn't contain these programs there is no need in wrapping
them. This commit just remove the postInstall section of corresponding
package.
2016-11-12 14:34:13 +03:00
Tim Steinbach 1120f2a2b7
xc3sprog: 748 -> 787 2016-11-04 11:23:43 -04:00
Vladimír Čunát 80d956caf3
intltool: fix the patch URL, #19487
I hope it's without mistake now. I re-checked the download,
avoiding the binary caches where it would go usually.
2016-10-29 20:42:18 +02:00
Bjørn Forsman 63bf567001 saleae-logic: 1.2.9 -> 1.2.10 (bugfixes) 2016-10-26 17:16:10 +02:00
Bjørn Forsman 0495b0763f saleae-logic: fix 32-bit source hash
I messed up in commit 314b1fbf0 ("saleae-logic: 1.1.15 -> 1.2.9").
2016-10-26 17:16:10 +02:00
Frederik Rietdijk 7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Luca Bruno 57a791b4ff Merge pull request #17751 from michalrus/awf-gtk
awf: init at 1.3.1
2016-10-23 14:54:03 +01:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Vladimír Čunát 4d5b893002 Merge #19081: gnome-3.22
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Frederik Rietdijk 2a1c4e9322 itstool: use python2
See https://github.com/NixOS/nixpkgs/issues/19631 for a proper fix.
2016-10-18 23:16:03 +02:00
Graham Christensen 104d6965af
hound: fixup meta 2016-10-16 13:10:41 -04:00
Graham Christensen 14384f02e8
hound: init at 20160919 2016-10-15 13:32:16 -04:00
zimbatm cdbb020a1f fixes bundlerEnv calls 2016-10-14 16:56:42 +01:00
zimbatm 6351c4d24b Merge pull request #19180 from zimbatm/bundler-env-bins
Bundler env bins
2016-10-14 11:51:23 +01:00
Daniel Peebles 9703a72f70 Merge pull request #19495 from LnL7/darwin-gdb
gdb: disable format hardening
2016-10-13 15:57:19 -04:00
Vladimír Čunát e4d3254101 intltool: fix #19487 patch download
It's strange.  Maybe they prune the history.
2016-10-13 21:55:25 +02:00
Daiderd Jordan c5a7728152
gdb: disable format hardening 2016-10-13 21:33:07 +02:00
Franz Pletz cdd019811c
intel-gpu-tools: 1.14 -> 1.16 2016-10-13 03:18:52 +02:00
Lancelot SIX db4b15bbbf gdb: 7.11.1 -> 7.12
See http://lists.gnu.org/archive/html/info-gnu/2016-10/msg00007.html
for release announcement
2016-10-10 09:08:43 +02:00
zimbatm 80d4117a8c travis: simplify 2016-10-08 22:38:56 +01:00
Daiderd Jordan 4589a8d750 Merge pull request #19222 from jhhuh/jh
lsof: fixed for darwin
2016-10-06 20:38:07 +02:00
Ji-Haeng Huh 86dc8ad0fd lsof-4.89 : change 'stdenv.libc' to 'stdenv.cc.libc' 2016-10-06 15:27:29 +02:00
Ji-Haeng Huh b150da5755 Merge remote-tracking branch 'upstream/master' into jh 2016-10-06 14:39:15 +02:00
Vladimír Čunát 30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Bjørn Forsman b0d77698bf gpshell: wrap with gppcscconnectionplugin
Fixes this:

  $ echo establish_context | gpshell
  establish_context
  establish_context failed with error 0xFFFFFFFFFFFFFFFF (libgppcscconnectionplugin.so.1.0.1: cannot open shared object file: No such file or directory)

Have to use LD_LIBRARY_PATH instead of patchelf, because it's
libglobalplatform.so.6 (from globalplatform package) that needs
libgppcscconnectionplugin.so.1.0.1, not gpshell itself. And because
RPATH doesn't "propagate" from one ELF to another, the library isn't
found. One can argue that globalplatform should depend on
gppcscconnectionplugin, but it touches on the still-unsolved "plugin"
issue in Nix packaging, so leaving that alone.
2016-10-05 17:06:15 +02:00
Kirill Boltaev 3e646865f4 treewide: use ocaml.version (#19192) 2016-10-05 09:32:30 +02:00
Thomas Tuegel d067b7bd35
Merge branch 'kde-5' into staging 2016-10-04 21:50:17 -05:00
Ji-Haeng Huh b5b907f3fb corretions for PR comments 2016-10-05 01:27:47 +02:00
Ji-Haeng Huh f02f1a490b Fixing lsof-4.89 for Darwin 2016-10-04 15:37:35 +02:00
Michael Raskin 94e87bd79b lsof: add one more mirror, the second one seems unavailable (and the original site is too picky about NATs) 2016-10-04 10:16:22 +02:00
Jörg Thalheim 888f6a1280 Merge pull request #19199 from wizeman/u/fix-help2man-hash
help2man: fix hash
2016-10-03 19:26:44 +02:00
Ricardo M. Correia 2ad13953a4 help2man: fix hash 2016-10-03 18:49:47 +02:00
Tuomas Tynkkynen 19225bf5cc Merge remote-tracking branch 'upstream/master' into staging 2016-10-02 10:36:47 +03:00
Susan Potter c3e57f3095
kibana: fix 4.6.0 for i686 2016-10-01 14:45:22 -05:00
Periklis Tsirakidis 3dc6b19325 md2man: enable for darwin 2016-09-30 16:44:44 +02:00
Eelco Dolstra 518340624d Merge remote-tracking branch 'origin/master' into staging 2016-09-29 13:06:14 +02:00
Frederik Rietdijk 1729dcd264 Merge pull request #19065 from peterhoeg/global
gnu global: 6.5.4 -> 6.5.5
2016-09-29 08:59:16 +02:00
Peter Hoeg 76aa997f20 gnu global: 6.5.4 -> 6.5.5 2016-09-29 10:40:51 +08:00
Vladimír Čunát 77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Joachim F a5580c9951 Merge pull request #18765 from aske/ocaml-move
Reorganize ocaml packages
2016-09-26 23:17:53 +02:00
Michael Raskin f5375a5a9d luarocks: 2.3.0 -> 2.4.0 2016-09-26 15:49:30 +02:00
Frederik Rietdijk 3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Kirill Boltaev e5fa83e7f5 trv: explicitly specify camlp4 packages 2016-09-26 02:36:49 +03:00
Frederik Rietdijk 0bd31510f0 dfeet: do not use top-level python packages
and use mkPythonDerivation.
2016-09-25 23:00:08 +02:00
Susan Potter 46ff1c385f kibana: 4.5.2 -> 4.6.0 (#18277)
Includes supporting binary src for x86_64-linux, x86_64-darwin, and
i686-linux which were previously unsupported and failed grossly before.
2016-09-25 21:40:15 +02:00
Lancelot SIX 444c0420d8 pkgs.autoconf-archive: 2016.03.20 -> 2016.09.16 (#18706) 2016-09-25 14:29:35 +02:00
Vladimír Čunát fffc7638cd Merge branch 'master' into staging 2016-09-24 18:54:31 +02:00
Daiderd Jordan 8377bf39c3 Merge pull request #18739 from veprbl/ccache_fix2
ccache: improve compiler wrapper
2016-09-22 20:40:41 +02:00