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
Joachim F
3b19fcb2dc
Merge pull request #18728 from dudebout/cscope-cleanup
...
Cscope cleanup
2016-09-21 20:36:29 +02:00
Eelco Dolstra
ddd41a509a
virtualbox: Drop dontPatchELF hack
...
However, this also requires ad8f31df7f
to get rid of gcc_multi.out in the closure.
2016-09-20 18:02:19 +02:00
Eelco Dolstra
7a4209c356
Merge remote-tracking branch 'origin/master' into staging
2016-09-20 17:46:09 +02:00
Dmitry Kalinkin
96d2a6c434
ccache: improve compiler wrapper
...
* move compiler detection logic from nix to bash
* robust inheritance of isGNU/isClang
Fixes: d3274e8ae3
('ccache: support clang in ccache.links')
Fixes: 634824d50b
('ccache: fix references to stdenv.cc.cc.isClang')
2016-09-18 14:54:12 -04:00
Joachim Fasting
634824d50b
ccache: fix references to stdenv.cc.cc.isClang
...
afa64a60bc
breaks the
tarball job https://hydra.nixos.org/build/40817224/nixlog/1/raw
The problem is that there is a stdenv.cc.cc.isGNU but no corresponding
stdenv.cc.cc.isClang. The "correct" fix would be to add
stdenv.cc.cc.isClang but this is simpler.
2016-09-18 15:58:53 +02:00
Nicolas Dudebout
9cea84a085
cscope: 15.8a -> 15.8b
2016-09-18 09:22:27 -04:00
Nicolas Dudebout
718678bba8
cscope: remove unused dependency on pkgconfig
2016-09-18 09:22:27 -04:00
Nicolas Dudebout
2dc6e41147
cscope: make emacs support optional
...
Other nixpkgs offer cscope-emacs integration and they use package.el to
register the package. When using such package, only the cscope binary is
required.
2016-09-18 09:22:27 -04:00
Nicolas Dudebout
03ae8729d4
cscope: do all emacs mode creation in postInstall
...
One part of the emacs mode creation was done in preConfigure, and one in
postInstall, but both could be done together.
2016-09-18 09:22:27 -04:00
Daiderd Jordan
afa64a60bc
Merge pull request #18135 from veprbl/ccache_fix
...
ccache: enable build on darwin
2016-09-17 22:35:43 +02:00
Dmitry Kalinkin
d3274e8ae3
ccache: support clang in ccache.links
2016-09-17 16:32:38 -04:00
Dmitry Kalinkin
d7f22f96b0
ccache: enable build on macOS
2016-09-17 16:32:37 -04:00
Vladimír Čunát
52e1a198cf
Merge branch 'master' into staging
2016-09-17 00:31:34 +02:00
Ram Kromberg
7238a94584
bsdbuild: groff -> mandoc
2016-09-15 20:44:49 +03:00
Jaka Hudoklin
7a9dd489d6
Merge pull request #18481 from offlinehacker/pkgs/docker/1.12.1
...
docker: 1.10.3 -> 1.12.1
2016-09-13 15:59:18 +02:00
Kirill Boltaev
bccd75094f
treewide: explicitly specify gtk and related package versions
2016-09-12 18:26:06 +03:00
Jaka Hudoklin
ea2270aa7c
go-md2man: init at 1.0.6
2016-09-12 01:31:58 +02:00
Lancelot SIX
1708c369fa
texinfo: 6.1 -> 6.3
...
See http://lists.gnu.org/archive/html/info-gnu/2016-09/msg00004.html
for release anouncement
2016-09-11 12:24:38 +02:00
Ram Kromberg
ccd5c6e47c
bsdbuild: init at 3.1 ( #18069 )
2016-09-05 23:28:42 +02:00
Tuomas Tynkkynen
d3dc3d4130
Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
...
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
89833c0c72
binutils: Shuffle outputs
2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
306cd03cdb
indent: disable format hardening
2016-08-29 01:29:00 +00:00
obadz
3de6e5be50
Merge branch 'master' into staging
...
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Lancelot SIX
0c12ae5615
binutils: 2.26.1 -> 2.27
...
Release announcement at
http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00012.html
2016-08-26 08:51:09 +02:00
Robin Gloster
29649b93b8
arcanist: 20160516 -> 20160825
2016-08-25 23:27:56 +00:00
Robin Gloster
eddc0a5549
treewide: fix darwin builds by using getOutput
...
This fixes eval for pkgs referring to optional static output
2016-08-25 08:44:20 +00:00
Franz Pletz
df275f5b85
treewide: fix darwin builds by referring to stdenv's libc
2016-08-25 02:56:25 +02:00
Robin Gloster
423e67b299
automake110x: remove unused package
2016-08-24 21:07:59 +00:00
Franz Pletz
1bb15303ca
prelink: fix glibc static linking
2016-08-24 21:31:02 +02:00
obadz
78b7529ee3
Merge branch 'master' into staging
2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23
Merge pull request #17685 from matthewbauer/darwin-misc2
...
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz
0e8d2725dc
Merge branch 'master' into staging
2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
dcbd607682
opa: Use makeBinPath
2016-08-23 03:54:23 +03:00
Joachim F
32ae6f1865
Merge pull request #17881 from acowley/indent
...
indent: fix on darwin
2016-08-23 01:14:14 +02:00
Tuomas Tynkkynen
74a3a2cd7e
treewide: Use makeBinPath
2016-08-23 01:18:10 +03:00
obadz
24a9183f90
Merge branch 'hardened-stdenv' into staging
...
Closes #12895
Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Anthony Cowley
2f08af9379
indent: fix on darwin
2016-08-21 11:26:01 -04:00
Nikolay Amiantov
ff22705793
treewide: replace several /sbin paths by /bin
2016-08-19 17:56:45 +03:00
Alexey Shmalko
1a2c7fe628
ycmd: fix build
...
This also fixes build for Mac OS X. The build failed before because both
clang and clang-unwrapped were in scope and CMake tried to compile the
library with unwrapped clang with well-understood consequences.
This commit fixes the issue by passing libclang through a different way.
2016-08-18 03:26:51 +03:00
Matthew Bauer
b988a35436
tie: fix darwin build
2016-08-16 19:25:45 +00:00
Matthew Bauer
2d57d9440e
stm32flash: fix darwin build
2016-08-16 19:25:44 +00:00
Shea Levy
9adad8612b
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
...
Was meant to go into staging, sorry
This reverts commit 57b2d1e9b0
, reversing
changes made to 760b2b9048
.
2016-08-15 19:05:52 -04:00
Nikolay Amiantov
1afd250676
treewide: replace several /sbin paths by /bin
2016-08-16 00:19:25 +03:00
Michal Rus
9b4ef5bb54
awf: init at 1.3.1
2016-08-15 12:17:56 +02:00
Robin Gloster
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
Marius Bakke
7c03a0d1ae
gpshell: init at 1.4.4
2016-08-11 00:11:20 +01:00
Nikolay Amiantov
3fca2ce204
fix invalid antiquotations
...
See https://github.com/NixOS/nix/issues/1017
2016-08-08 18:08:37 +03:00
Robin Gloster
a3a2d52595
rman: disable format hardening
2016-08-03 20:19:41 +00:00
Robin Gloster
08928dc57a
kconfig-frontends: disable format hardening
2016-08-03 20:03:18 +00:00
Robin Gloster
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
mimadrid
5c017832e9
strace: 4.12 -> 4.13
2016-08-03 11:09:43 +02:00
Tuomas Tynkkynen
21f17d69f6
treewide: Add lots of meta.platforms
...
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
63de40099f
treewide: Move some meta sections to end-of-file
...
That seems to be the overwhelming convention.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
2258b21e4b
treewide: Add lots of platforms to packages with no meta
...
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00:00
Vladimír Čunát
3a402e248f
Merge branch 'staging'
...
It includes a security update of libidn.
2016-07-28 20:36:17 +02:00
Franz Pletz
ecb4fb0046
ddd: use motif instead of lesstif
...
See #17322 .
2016-07-28 03:52:14 +02:00
Christian Lask
87b93d2ff7
Kibana: 4.5.1 -> 4.5.2
2016-07-27 17:47:03 +02:00
Vladimír Čunát
49ad8ce561
Merge branch 'master' into staging
2016-07-26 20:52:54 +02:00
Bjørn Forsman
d5c27859b4
Fix eval (swig)
2016-07-26 15:34:49 +02:00
leenaars
eb2e3965b8
swig: 3.0.7 -> 3.0.10
2016-07-26 14:49:34 +02:00
Robin Gloster
f222d98746
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-25 12:47:13 +00:00
Miguel Madrid
b45ee066bc
itstool: 1.2.0 -> 2.0.2 ( #17189 )
2016-07-23 00:32:43 +02:00
Lancelot SIX
281449424f
binutils: 2.26 -> 2.26.1
...
See announcement at
http://lists.gnu.org/archive/html/info-gnu/2016-07/msg00000.html
2016-07-22 10:20:10 +02:00
Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
Vladimír Čunát
1b5ac05845
Merge branch 'staging'
...
Includes security fixes in gd and libarchive.
2016-07-14 15:51:28 +02:00
Gabriel Ebner
6c7d179509
tokei: add meta.platforms
2016-07-14 10:21:46 +02:00
Gabriel Ebner
aab727fd77
tokei: init at 3.0.0
2016-07-14 10:19:20 +02:00
Vladimír Čunát
40785f0dac
Merge branch 'master' into staging
...
Hydra nixpkgs: ?compare=1282763
2016-07-12 22:00:10 +02:00
Arseniy Seroka
356e9c04da
Merge pull request #16771 from mimadrid/init/universal-ctags-2016-07-06
...
universal-ctags: init at 2016-07-06
2016-07-12 17:56:30 +04:00