JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,687 Commits 2 Branches 0 Tags 13 GiB
ca9ce9ace4
Commit Graph

4188 Commits

Author SHA1 Message Date
Joachim F
f2e0484292 Merge pull request #19020 from aherrmann/pr_clang_tools 
clang-tools: New package
 2016-09-29 13:16:20 +02:00
Eelco Dolstra
518340624d Merge remote-tracking branch 'origin/master' into staging 2016-09-29 13:06:14 +02:00
Fatih Altinok
f9c8dceb11 bump flow version to 0.32 2016-09-29 08:36:07 +00: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
Tuomas Tynkkynen
88a1ca3977 Merge pull request #18658 from bendlas/init-systemtap 
systemtap: init at 51b7ca
 2016-09-29 05:03:56 +03:00
Vladimír Čunát
77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Peter Simons
e521930e08 Merge pull request #18913 from robbinch/pkg-tinc 
tinc: 20160511 -> 20160924
 2016-09-28 16:17:27 +02:00
Andreas Herrmann
4a3e6d3091 clang-tools: New package 
Creates and installs wrapper scripts around the clang-tools from
`llvmPackages.clang-unwrapped`.

Motivation
----------

Fixes #9214

Allows to install clang-tools for C++ development without also installing the
clang compiler and its tool-chain. This way it is possible to use e.g.
`clang-format` without conflicting with e.g. GCC's tool-chain, or the global
system tool-chain.
 2016-09-28 09:31:30 +02:00
Franz Pletz
a6d4ea4c2c
treewide: remove executable flags from .nix files 2016-09-27 22:15:00 +02:00
Kamil Chmielewski
badd0ce218 go2nix: 1.1.0 -> 1.1.1 2016-09-27 16:49:14 +02:00
Joachim F
0973ee51e4 Merge pull request #18987 from maurer/oasis_typo 
oasis: fix typo
 2016-09-27 00:15:45 +02:00
Matthew Maurer
047f105bd1 oasis: fix typo 
The URL uses the filename of 0.4.6 in the 0.4.7 package.
The package still works currently and provides 0.4.7, because ocamlforge
dispatches entirely based on the number before that, the filename is just
sugar.
 2016-09-26 18:05:08 -04:00
zimbatm
d4c66e2f46 Merge pull request #18694 from bachp/runner-master 
gitlab-runner: add package and service
 2016-09-26 22:45:39 +01:00
Joachim F
a5580c9951 Merge pull request #18765 from aske/ocaml-move 
Reorganize ocaml packages
 2016-09-26 23:17:53 +02:00
Robbin C
5c5c059912 tinc: 20160511 -> 20160924 
Fix broken build.
 2016-09-27 01:09:45 +08:00
Michael Raskin
ccc8c427d5 slimerjs: 0.10.0 -> 0.10.1 2016-09-26 15:49:30 +02:00
Michael Raskin
f5375a5a9d luarocks: 2.3.0 -> 2.4.0 2016-09-26 15:49:30 +02:00
Michael Raskin
15e5c5214c jq: fix autoupdate metadata in case it gets updated in future 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
Kirill Boltaev
8447340904 omake: mark as broken 2016-09-26 02:36:49 +03:00
Kirill Boltaev
a8da2da780 ocamlmod: 0.0.7 -> 0.0.8 2016-09-26 02:36:49 +03:00
Kirill Boltaev
e61663a233 treewide: move to ocaml-ng system 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
Aneesh Agrawal
bfbca9dacd jq: Fix CVE-2015-8863 and CVE-2016-4074 (#18908) 
jq has not had a release since v1.5 in August 2015, so backport both of
these patches (the fix for CVE-2015-8863 is in the current master, while
the fix for CVE-2016-4074 is not yet in master).
 2016-09-25 15:14:52 +02:00
Lancelot SIX
444c0420d8 pkgs.autoconf-archive: 2016.03.20 -> 2016.09.16 (#18706) 2016-09-25 14:29:35 +02:00
Franz Pletz
7203a0e94c Merge pull request #18576 from maurer/oasis 
oasis: 0.4.6 -> 0.4.7
 2016-09-25 07:49:01 +02:00
Rok Garbas
60f31c6077 pypi2nix: 1.4.0 -> 1.5.0 (#18941) 2016-09-25 04:42:23 +02:00
Vladimír Čunát
aaa29843c3 Merge #18909: flex: 2.6.0 -> 2.6.1 
It contains security fixes.
 2016-09-24 18:54:44 +02:00
Vladimír Čunát
fffc7638cd Merge branch 'master' into staging 2016-09-24 18:54:31 +02:00
Aneesh Agrawal
bb349421c1 rr: pin Python to Python 2 
rr requires Python>=2.7, but does not support Python 3.
 2016-09-24 15:05:42 +02:00
Graham Christensen
feec685636
flex: 2.6.0 -> 2.6.1 2016-09-23 21:42:08 -04:00
Matthew Maurer
6f5d3bec32 oasis: 0.4.6 -> 0.4.7 2016-09-23 19:58:47 -04:00
Tim Steinbach
084fa30411 gradle: 3.0 -> 3.1 (#18898) 2016-09-24 00:57:09 +02:00
Pascal Bach
373b37f179 gitlab-runner: init at 1.6.0 2016-09-23 22:38:56 +02:00
Joachim F
ac8206e31d Merge pull request #17147 from regnat/ocamlUpdates 
ocamlPackages : update some packages
 2016-09-23 19:55:10 +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
Benjamin Staffin
a28b8ec771 Merge pull request #18809 from teh/bazel-update 
bazel: 20150326.981b7bc1 -> 0.3.1
 2016-09-22 02:28:10 -04:00
rushmorem
89c8b6c379 glide: 0.10.2 -> 0.12.2 2016-09-21 21:53:00 +02:00
Joachim F
3b19fcb2dc Merge pull request #18728 from dudebout/cscope-cleanup 
Cscope cleanup
 2016-09-21 20:36:29 +02:00
Tom Hunger
93c773391d bazel: 20150326.981b7bc1 -> 0.3.1 2016-09-21 18:42:43 +01: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
Eelco Dolstra
5f8a330d40 outputDocdev -> outputDevdoc 
For consistency with the devdoc output.
 2016-09-20 17:44:48 +02:00
Daiderd Jordan
542babc3d2 Merge pull request #18670 from holidaycheck/sauceconnect-4.4.0 
sauce-connect: 4.3.16 -> 4.4.0
 2016-09-20 12:35:15 +02:00
Eelco Dolstra
e03d1ababa cmake-2.8: Fix build 
The use of multiple outputs in libarchive broke it. Since this is an
ancient version of cmake, let's fix it by just using
--no-system-libarchive.
 2016-09-20 11:56:11 +02:00
rushmorem
391ea6f748 glock: init at 20160816 2016-09-20 10:56:11 +02:00
Frederik Rietdijk
5a1d3be81c Merge pull request #18647 from nand0p/buildbot-9rc3 
buildbot: 0.9.0rc2 -> 0.9.0rc3
 2016-09-18 22:57:18 +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
Mathias Schreck
7e7a54aba0 sauce-connect: refactor patchPhase instead of reordering phases 2016-09-17 19:49:01 +02:00
Mathias Schreck
50111d5cf4 sauce-connect: 4.3.16 -> 4.4.0 2016-09-17 19:49:01 +02:00
Joachim F
1868783a90 Merge pull request #18619 from RamKromberg/init/mandoc 
Init mandoc at 1.13.4 & replace groff with it in libedit and bsdbuild
 2016-09-17 16:15:35 +02:00
Daiderd Jordan
8e8c5a3429 Merge pull request #18424 from ppickfor/rainicorn 
rainicorn: init at 1.0.0
 2016-09-17 11:11:41 +02:00
rushmorem
6b8275eaf9 goa: init at 1.0.0 2016-09-17 01:15:14 +02:00
Vladimír Čunát
52e1a198cf Merge branch 'master' into staging 2016-09-17 00:31:34 +02:00
Fernando J Pando
b31b262623 buildbot: 0.9.0rc3 wrapper fix 
- Tested on Linux
- Tested binary execution
- Fixes missing PYTHONPATH
 2016-09-16 16:27:49 -04:00
Herwig Hochleitner
59ccacbcd3 systemtap: clean up as per feedback 
- shorter description
- move systemtap into linuxPackages
  this is only necessary for the wrapper
  systemtap also has a dyninsn backend to instrument userspace apps
  we could experiment with other platforms, using this
- get rid of stow build dependency
- update version
- minor cleanup steps
 2016-09-16 22:24:49 +02:00
Fernando J Pando
57726b54af Remove obsolete buildbot slave 
buildbot-slave has been replaced with buildbot-worker.
 2016-09-16 11:20:26 -04:00
Fernando J Pando
164036d728 buildbot: 0.9.0rc2 -> 0.9.0rc3 
Tested on Linux
Tested Binary Execution
 2016-09-16 11:20:02 -04:00
Herwig Hochleitner
b019424e5d systemtap: init at 51b7ca 
master needs to be tracked in order to support recent kernels
 2016-09-16 12:19:59 +02:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
Ram Kromberg
7238a94584 bsdbuild: groff -> mandoc 2016-09-15 20:44:49 +03:00
Joachim F
09646cc8a5 Merge pull request #18501 from tvon/update/gocd-server-16.9.0-4001 
gocd-server: 16.7.0-3819 -> 16.9.0-4001
 2016-09-15 13:17:17 +02:00
Joachim F
cbdad9b5e9 Merge pull request #18502 from tvon/update/gocd-agent-16.9.0-4001 
gocd-agent: 16.7.0-3819 -> 16.9.0-4001
 2016-09-15 13:17:06 +02:00
Joachim F
068106cf6a Merge pull request #18571 from peterhoeg/wp-cli 
wp-cli: 0.23.1 -> 0.24.1
 2016-09-14 17:56:03 +02:00
Kirill Boltaev
0f37287df5 treewide: explicitly specify gtk version 2016-09-13 21:09:24 +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
Peter Hoeg
baf401cdf4 wp-cli: 0.23.1 -> 0.24.1 2016-09-13 18:20:51 +08:00
Nikolay Amiantov
4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Franz Pletz
fb9117efa6 Merge pull request #18488 from chris-martin/md5-2 
Miscellaneous packages: Use sha256 instead of md5 (part 2)
 2016-09-13 07:11:43 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Jesse Haber-Kucharsky
99e06fe771 opam, aspcud: init packages for external solver (#16938) 
The opam package manager relies on external solvers to determine package
management decisions it makes related to upgrades, new installations,
etc.

While, strictly speaking, an external solver is optional, aspcud is
highly recommended in documentation. Furthermore, even having a
relatively small number of packages installed quickly causes the limits
of the interal solver to be reached (before it times out).

Aspcud itself depends on two programs from the same suite: gringo, and
clasp.

On Darwin, Boost 1.55 (and thus Gringo) do not build, so we only support
Aspcud on non-Darwin platforms.
 2016-09-12 10:44:50 +02: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
Tom von Schwerdtner
9a2f40c024 gocd-agent: 16.7.0-3819 -> 16.9.0-4001 2016-09-10 18:33:14 -04:00
Tom von Schwerdtner
18f26f3563 gocd-server: 16.7.0-3819 -> 16.9.0-4001 2016-09-10 18:32:43 -04:00
Chris Martin
d1e23ed8ed mk: md5->sha256 2016-09-10 14:08:26 -04:00
Chris Martin
5a3560fecf gnumake-3.80: md5->sha256 2016-09-10 14:06:13 -04:00
Tuomas Tynkkynen
290db94f04 Merge remote-tracking branch 'upstream/master' into staging 2016-09-09 02:40:47 +03:00
Peter Pickford
841d7e157b rainicorn: init at 1.0.0 2016-09-08 13:56:42 -07:00
Michael Raskin
dabf09aa92 cmake: update setup-hook to take -isystem instead of -I into account 2016-09-08 09:10:00 +02:00
Michael Raskin
592e265caa antlr3_4: init at 3.4 2016-09-06 18:19:17 +02:00
Michael Raskin
8f284c0a94 antlr3_5: init at 3.5.2 2016-09-06 18:19:17 +02:00
Aneesh Agrawal
b1c83e8928 vagrant: make patches a list (#18364) 
This has more correct semantics, allows for multiple patches, and makes
using overrideDerivation to add/remove patches work as expected.
 2016-09-06 16:52:01 +02:00
Sheena Artrip
47e6d7d88c minizinc: init at 2.0.14 (#18308) 2016-09-06 06:16:42 +02:00
Ram Kromberg
ccd5c6e47c bsdbuild: init at 3.1 (#18069) 2016-09-05 23:28:42 +02:00
Eelco Dolstra
78178d5854 systemd: Separate lib output 
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
 2016-09-05 19:17:14 +02:00
Peter Hoeg
a359d330dc vagrant: 1.8.4 -> 1.8.5 (#18283) 
Includes https://github.com/mitchellh/vagrant/pull/7611 to fix issue with permissions on ~/.ssh/authorized_keys.
 2016-09-05 14:44:34 +02:00
Tuomas Tynkkynen
1e665de6b4 flow: Broken on i686 
http://hydra.nixos.org/build/39411311

````
hh_shared.c:142:6: error: #error "hh_shared.c requires a architecture that supports memfd_create"
````
 2016-09-02 18:54:39 +03:00
zimbatm
d376b10105 packer: fixes compilation issues (#18217) 
* the default output for buildGoPackage is not "out" anymore
* go 1.7 has removed the linker flag deprecation which breaks packer's
  Makefile
 2016-09-02 17:13:38 +02:00
Tuomas Tynkkynen
3364230d56 Disable bunch of non-compiling packages on Darwin 
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
 2016-09-01 20:39:33 +03:00
Frederik Rietdijk
f2fc64a412 Remove buildbot_8 
We now have a newer version and the older version didn't work anymore
anyway because it depended on sqlalchemy7 which was itself broken,
because it depended on an older version of sqlite.
 2016-09-01 17:46:27 +02:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
 2016-09-01 13:27:27 +03:00
Jaka Hudoklin
e0da6b16f6 Merge pull request #17959 from offlinehacker/pkgs/kube-aws/init 
kube-aws: init at 0.8.1
 2016-09-01 11:58:38 +02:00
Fernando J Pando
d86114cbd5 buildbot: init at 0.9.0rc2 
buildbot: init
buildbot-0.9.0rc2

buildbot-worker: init
buildbot-worker-0.9.0rc2

buildbot-ui: init
buildbot-www-0.9.0rc2

buildbot-full: init
buildbot-www-0.9.0rc1
buildbot-waterfall-view-0.9.0rc2
buildbot-console-view-0.9.0rc2
 2016-09-01 11:31:15 +02:00
Frederik Rietdijk
7cf000b77e buildbot -> buildbot_8 2016-09-01 11:31:15 +02:00
Sander van der Burg
c4e67a3dc9 node-webkit: fix library references with multiple output derivations 2016-08-31 20:48:23 +00: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
Robin Gloster
6f21201f93
rtags: git-2016-04-29 -> 2.3 
should fix the darwin build
 2016-08-29 13:33:36 +00:00
Vladimír Čunát
f688ea37d8 bear: init at 2.2.0 2016-08-29 14:13:01 +02:00
Tuomas Tynkkynen
89833c0c72 binutils: Shuffle outputs 2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen
8ed3d6a7e5 cmake 2.8: Fix build with shuffled outputs 2016-08-29 14:49:52 +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
Robin Gloster
193a57fa48
noweb: remove obsolete substituteInPlace 2016-08-27 21:54:55 +00:00
Robin Gloster
fee9b3410e Merge pull request #18014 from zimbatm/buildGoPackage-1.7 
Build go package 1.7
 2016-08-26 15:41:08 +00:00
zimbatm
db3de7a900 leaps: mark as broken 
The package sha256 is wrong. After fixing it the build has dependency
issues like:

    go/src/github.com/jeffail/leaps/cmd/leaps/bindata_assetfs.go:203:2:
    cannot find package "github.com/elazarl/go-bindata-assetfs" in any
    of:

/cc @qknight
 2016-08-26 13:46:05 +01:00
Matthias Beyer
ae428c6411 rustfmt: 0.4 -> 0.6 2016-08-26 14:17:14 +02:00
Markus Hauck
df343d4824 scalafmt: 0.2.11 -> 0.3.1 (#18004) 2016-08-26 07:03:41 +00: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
Moritz Ulrich
78305bc5a1 Merge pull request #17944 from steveeJ/racerd-bump 
rust: bump registry and racerd
 2016-08-26 00:03:34 +02:00
Robin Gloster
eabef9420a
re2c: 0.14.3 -> 0.16 2016-08-25 16:07:40 +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
Jaka Hudoklin
274ff94974 kube-aws: init at 0.8.1 2016-08-24 14:25:57 +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
Stefan Junker
9acd218a9e rust racerd: 0.1.1 -> 2016-08-23 2016-08-23 21:25:48 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Joachim F
56bfc0240e Merge pull request #17766 from NeQuissimus/gradle30 
gradle: 2.14.1 -> 3.0, keep 2.14.1
 2016-08-23 16:22:05 +02:00
Moritz Ulrich
08933f8a07 leiningen: Simplify build. 2016-08-23 12:38:24 +02:00
Tuomas Tynkkynen
dcbd607682 opa: Use makeBinPath 2016-08-23 03:54:23 +03:00
Joachim F
96ee6f08c6 Merge pull request #17923 from vrthra/redo-update 
redo: update download URL
 2016-08-23 01:20:14 +02: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
Rahul Gopinath
746ec27c46 redo: update download URL 2016-08-22 13:37:59 -07: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
obadz
68936edfb3 Merge branch 'master' into staging 2016-08-21 12:03:41 +01:00
Vladimír Čunát
d515cd8cdd Merge #17868: treewide: switch sourceforge to mirror:// 2016-08-20 18:10:55 +02:00
Vladimír Čunát
cdb44a4ada Merge branch 'master' into staging 2016-08-20 18:01:36 +02:00
Joachim Schiele
af15e057f4 leaps v0.5.0 init 2016-08-20 16:03:14 +02:00
J Phani Mahesh
aa1ff9ef7d omniorb: switch sf downloads to mirror:// 
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
 2016-08-20 19:14:29 +05:30
Joachim Fasting
ba0f9cfa49
Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors" 
This reverts commit 217594fd1d, reversing
changes made to 8e8a89d8a8.

Turns out it wasn't ready afterall ...
 2016-08-20 15:14:23 +02:00
J Phani Mahesh
7503b0e569 omniorb: switch sf downloads to mirror:// 2016-08-20 17:24:15 +05:30
Nikolay Amiantov
ff22705793 treewide: replace several /sbin paths by /bin 2016-08-19 17:56:45 +03:00
Austin Seipp
59428b94a6 nixpkgs: icestorm 2016.05.21 -> 2016.08.18 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2016-08-19 01:55:13 +00:00
Joachim F
d7d7d28b1f Merge pull request #17809 from rasendubi/ycmd 
ycmd: fix build
 2016-08-18 14:23:30 +02: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
c3974455eb gnustep: rescope everything into one folder 
This should make merge conflicts easier to
handle. "gnustep" prefix has been removed to
make thing simpler. So "gnustep_make" is now
"make" within the gnustep scope.
 2016-08-16 21:10:54 +00:00
Artyom Shalkhakov
d3d580ebbe gnustep: cleanup 
Major clean-up. Everything builds fine.
 2016-08-16 21:00:27 +00:00
Artyom Shalkhakov
15c5a533b5 gnustep: add gworkspace and systempreferences 
Packaging some basic GNUstep apps: GWorkspace and SystemPreferences.

Unfortunately, GWorkspace doesn't work well, because gdomap, gdnc, gpbs
are not started. Also, there is some issue with fonts not being found.
 2016-08-16 20:59:58 +00:00
Artyom Shalkhakov
ea3dcb3264 gnustep: add setup hook for make 
Adding a setup-hook for gnustep-make.
 2016-08-16 20:59:50 +00:00
Artyom Shalkhakov
4cbeef463c gnustep: use gnustep_builder 
Built ProjectCenter and Gorm with the new gnustep_builder. Had to go
back and fix a few things.
 2016-08-16 20:59:36 +00:00
Artyom Shalkhakov
d39e5372dc gnustep: cleanup 
Cleaning up. Adding GNUstep package builder for abstracting out GNUstep
compilation specifics (with thanks to GitHub user lethalman).

The rules for using build_gnustep_package are as simple: any
GNUstep-based package that the package being compiled depends upon are
to be put in [deps] (this is used for setting up a buildEnv), while
other dependencies are put into [buildInputs] as usual.
 2016-08-16 20:59:30 +00:00
Artyom Shalkhakov
52d17a5f41 gnustep: packageg libs separately 
Packing gnustep libs separately, with no use of gnustep-startup. Also,
fixed a bug in WindowMaker package (some imaging dependencies were not supplied).
 2016-08-16 20:59:08 +00: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
Matthew Bauer
ad61000697 cccc: fix darwin build 2016-08-16 19:25:41 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Tim Steinbach
6654b8274e
gradle: 2.14.1 -> 3.0, keep 2.14.1 2016-08-16 00:03:18 +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
Michal Rus
397a17aef9 visualvm: init at 1.3.8 (#17745) 2016-08-15 05:45:48 +02:00
Rok Garbas
e775eff2a9
pypi2nix: wrong hash 2016-08-15 04:01:14 +02:00
Rok Garbas
c29e76063e
pypi2nix: 1.3.0 -> 1.4.0 2016-08-15 03:46:43 +02:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
zimbatm
c2302f2f45 Merge pull request #17677 from kamilchm/no-go-libs-json 
buildGoPackage: remove Go deps file `libs.json`
 2016-08-12 18:13:29 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski
532b222296 vagrant: cleanup FIX plugin install from #17614 (#17663) 2016-08-12 09:33:37 +00:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json 
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
 2016-08-11 23:07:09 +02:00
Vladimír Čunát
d4de02c46e treewide: change $IN_NIX_SHELL handling 
... to be compatible with https://github.com/NixOS/nix/pull/933
while not breaking compatibility with current nix.
 2016-08-11 16:40:44 +02:00
Frederik Rietdijk
24fc76e600 Merge pull request #17653 from mbakke/gpshell 
Add GlobalPlatform tools
 2016-08-11 09:08:58 +02:00
Marius Bakke
7c03a0d1ae
gpshell: init at 1.4.4 2016-08-11 00:11:20 +01:00
Vladimír Čunát
947abb08ac Merge branch 'staging' 2016-08-10 22:09:38 +02:00
Graham Christensen
26d25774fa Merge pull request #17637 from swarren83/bump-gocd-server-version 
gocd-server: 16.6.0-3590 -> 16.7.0-3819
 2016-08-10 14:11:29 -04:00
Shawn Warren
c671fc6dd0 gocd-server: 16.6.0-3590 -> 16.7.0-3819 
Bump gocd-server version and update sha256 checksum.
 2016-08-10 12:45:57 -05:00
Shawn Warren
697b6d2f90 gocd-agent: 16.6.0-3590 -> 16.7.0-3819 
Bump gocd-agent version to 16.7.0-3819 and update sha256 checksum.
 2016-08-10 12:42:22 -05:00
Shawn Warren
8750b4892e bump gocd-agent version to 16.6.0-3590 (#17311) 
Update gocd-agent package version to 16.6.0-3590 including new sha.  Modify heapSize
and maxMemory mkOption to accurately reflect their intended purpose of configuring
initial java heap sizes.
 2016-08-10 17:10:13 +02:00
Robin Gloster
2005711164 Merge pull request #17613 from despairblue/update/flow 
flow: 0.28.0 -> 0.30.0
 2016-08-09 17:57:24 +00:00
Kamil Chmielewski
5d5b2d3f8f vagrant: FIX #16837 vagrant plugin install 2016-08-09 17:07:43 +02:00
Danny Arnold
21102b1589 flow: 0.28.0 -> 0.30.0 2016-08-09 16:51:13 +02:00
Aneesh Agrawal
746b591c68 vagrant: use libarchive lib from Nix (#17597) 
We currently already replace the embedded bsdtar binaries with the
corresponding ones from Nix. However, we also need to replace the
libarchive shared library to prevent version mismatches between the
embedded library and the Nix binaries.

Also expose version on the derivation and use environment variables
to make overriding the derivation easier.
 2016-08-09 12:01:48 +02:00
Nikolay Amiantov
3fca2ce204 fix invalid antiquotations 
See https://github.com/NixOS/nix/issues/1017
 2016-08-08 18:08:37 +03:00
Nikolay Amiantov
1e8894f085 unity3d: use chromium-suid-sandbox 2016-08-08 10:49:00 +03:00
Vladimír Čunát
03e32315a5 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1286624
 2016-08-07 11:35:28 +02:00
Tuomas Tynkkynen
1db43e0c18 rtags: Broken on i686 
http://hydra.nixos.org/build/38304790
 2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
fcc3a1b41d bazel: Broken on i686 
http://hydra.nixos.org/build/38314298
 2016-08-06 17:06:45 +03:00
Théophane Hufschmitt
2cb301d143 ocamlPackages.ocp-index : 1.1.2 -> 1.1.4 
And split according to ocaml version
 2016-08-04 14:44:35 +02:00
Théophane Hufschmitt
ce90c90274 ocamlPackages.ocamlbuild : init at 0.9.2 2016-08-04 14:44:35 +02:00
Théophane Hufschmitt
7c2ecbe921 ocamlPackages.camlp4 : add version for ocaml_4_03 2016-08-04 14:44:34 +02:00
Théophane Hufschmitt
7bb3a04064 ocamlPackages.merlin : 2.3.1 -> 2.5.0 
For ocaml > 4.02 only
 2016-08-04 14:44:33 +02:00
Théophane Hufschmitt
80078966ca ocamlPackages.ocp-build : 0.99.16-beta -> 0.99.17-beta 2016-08-04 14:44:02 +02:00
Tobias Geerinckx-Rice
06966f4955
icmake: 8.01.00 -> 9.00.00 2016-08-04 00:25:20 +02: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
c95ab0a2d1 gnumake380: disable format hardening 2016-08-03 20:03:04 +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
Franz Pletz
f0d0164a38 tracefilesim: disable fortify hardening 2016-08-02 20:21:29 +02:00
Tuomas Tynkkynen
898c3436f3 kcov: Fix indentation 2016-08-02 21:17:44 +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
Alexey Shmalko
176f804f36 cmake: 3.4.3 -> 3.6.0 2016-08-02 10:32:52 -05:00
Julien Dehos
5286c0aebb cmake: add support for cxxtest 2016-08-01 22:11:00 +02: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
Nathan Moore
251a1ccf55 solarus-quest-editor: init at 1.4.5 (#17286) 2016-07-27 18:49:02 +02:00
Shawn Warren
7234275cd5 bump gocd-server version to 16.6.0-3590 (#17304) 
Update gocd-server package version to 16.6.0-3590 including new sha.  Modify heapSize
and maxMemory mkOption to accurately reflect their intended purpose of configuring
initial java heap sizes.
 2016-07-27 18:44:28 +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
Robin Gloster
cb776e72a0 Merge pull request #17258 from leenaars/patch-1 
swig: 3.0.7 -> 3.0.10
 2016-07-26 15:27:02 +02:00
leenaars
eb2e3965b8 swig: 3.0.7 -> 3.0.10 2016-07-26 14:49:34 +02:00
Moritz Ulrich
a6562f77d0 rustracer: Enable doCheck and fix typo. 2016-07-25 21:39:47 +02:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Rok Garbas
a086b62a3d
pypi2nix: 1.2.0 -> 1.3.0 2016-07-25 04:25:51 +02:00
Daiderd Jordan
004f64fca6 Merge pull request #17201 from sorokin/rr-4.3 
rr: 4.2.0 -> 4.3.0
 2016-07-24 15:49:37 +02:00
Alexey Shmalko
a18abd2aa3 meson: 0.26.0 -> 0.32.0 2016-07-24 00:34:19 +02:00
Ivan Sorokin
844a029bab rr: 4.2.0 -> 4.3.0 2016-07-23 13:07:24 +03:00
Daiderd Jordan
20a0be5aee Merge pull request #17131 from cransom/jmespath 
jp: init at 0.1.2
 2016-07-23 00:52:45 +02:00
Miguel Madrid
b45ee066bc itstool: 1.2.0 -> 2.0.2 (#17189) 2016-07-23 00:32:43 +02:00
Shawn Warren
9886c80daa Add gocd agent and server service packages (#16273) 
GoCD is an open source continuous delivery server specializing in advanced workflow
modeling and visualization.  Update maintainers list to include swarren83.  Update
module list to include gocd agent and server module.  Update packages list to include
gocd agent and server package.  Update version, revision and checksum for GoCD
release 16.5.0.
 2016-07-23 00:29:18 +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
vbgl
d271db550e ocp-build: 1.99.9-beta -> 1.99.16-beta (#15553) 2016-07-22 09:46:40 +02:00
zimbatm
0384a5195d Merge pull request #17157 from kevincox/b2-0.6.2 
backblaze-b2: 0.4.4 -> 0.6.2
 2016-07-21 20:18:00 +01:00
Kevin Cox
050733abb0 backblaze-b2: 0.4.4 -> 0.6.2 2016-07-21 14:45:35 -04:00
Casey Ransom
d5ee0a27d0 jp: init at 0.1.2 
A json parson tool based on the JMESPATH query language.
http://jmespath.org/
 2016-07-21 10:42:54 -04:00
Peter Simons
4d11900a43 haskell-tinc: hydra builds fail 2016-07-21 13:54:35 +02:00
Gabriel Ebner
3016eb1c4b sbt: 0.13.11 -> 0.13.12 2016-07-21 12:29:14 +02:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Rok Garbas
e2f6c6b9d2 Merge pull request #16620 from zimbatm/ronn-0.7.3 
Ronn 0.7.3
 2016-07-21 01:23:06 +02:00
Tim Steinbach
3563be8dd6 gradle: 2.14 -> 2.14.1 2016-07-19 15:10:54 +00:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Langston Barrett
c40a0b50f7 doctl: init at 1.3.1 (#17066) 2016-07-19 12:30:35 +02:00
Langston Barrett
4063834f92 vagrant: 1.8.1 -> 1.8.4 2016-07-18 13:40:05 +00:00
Martin Gammelsæter
36459f1977 mypy-lang: 0.4.2 -> 0.4.3 (#17058) 2016-07-18 12:35:13 +02:00
Franz Pletz
727eb19a81 jenkins: 2.3 -> 2.13 2016-07-17 17:15:24 +02:00
Joachim Fasting
ce103cae38
cppcheck: 1.73 -> 1.74 2016-07-17 11:52:13 +02:00
Gabriel Ebner
f63ead3e5d Merge pull request #16977 from markus1189/scalafmt 
scalafmt: 0.2.5 -> 0.2.11
 2016-07-16 07:57:19 +02:00
Bjørn Forsman
8c2d888401 jenkins: move $out/{lib => webapps}/jenkins.war 
As pointed out by @danbst, the tomcat NixOS module expects packages
listed in services.tomcat.webapps to either be direct .war file paths or
have .war files inside a "webapps" directory.

Commit 4075c10a59
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.
 2016-07-15 17:18:44 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Bjørn Forsman
4075c10a59 jenkins: move .war file from $out to $out/lib/jenkins.war 
Fixes #14137, also known as:

  $ nix-shell -p jenkins
  bash: source: /nix/store/ln1yw6c2v8bb2cjqfr1z5aqcssw054wa-jenkins-2.3:
  cannot execute binary file
  [nix-shell exited with error]

The problem is that jenkins.war is not installed inside the directory
$out, but rather _as the file_ $out. Fix it by moving the file to
$out/lib/jenkins.war.

While at it, move buildCommand so that the "meta" section is at the end
of the expression (standard style), and quote shell variables.
 2016-07-15 15:12:52 +02:00