Commit Graph

4033 Commits

Author SHA1 Message Date
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
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
Markus Hauck
3d4a32835e scalafmt: 0.2.5 -> 0.2.11 2016-07-15 10:44:04 +02:00
Arseniy Seroka
5a9a71fb2c Merge pull request #16957 from holidaycheck/galen-2.3.0
galen: 2.2.4 -> 2.3.0
2016-07-14 22:19:58 +04: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
40d5284cc2 rustfmt: add meta.platforms 2016-07-14 12:10:09 +02:00
Gabriel Ebner
457a428813 rustracer: add meta.platforms 2016-07-14 12:10:09 +02:00
Mathias Schreck
8e4248a95d galen: 2.2.4 -> 2.3.0 2016-07-14 10:52:13 +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
Martin Gammelsæter
6c77af6f60 mypy-lang: Add missing lxml dependency 2016-07-12 11:22:24 +02:00
Martin Gammelsæter
811cf56f5f mypy-lang: init at 0.4.2 2016-07-11 19:35:00 +02:00
Eelco Dolstra
05bdc0c89f Remove unnecessary references to gcc5
These cause an unnecessary rebuild of gcc.
2016-07-11 10:46:34 +02:00
Danny Arnold
42c91dd1d8 flow: 0.22.1 -> 0.28.0 (#16827) 2016-07-10 14:02:21 +02:00
Vladimír Čunát
9d3228f99d gnumake42: bugfix 4.2 -> 4.2.1 2016-07-09 16:50:12 +02:00
Vladimír Čunát
95a9fa0ba0 Merge branch 'master' into staging 2016-07-09 16:49:48 +02:00
Rahul Gopinath
cf5ebca53e texinfo: 6.0 -> 6.1 2016-07-09 16:47:53 +02:00
Vladimír Čunát
3b2627586d Merge #16448: gnumake: optionally build with guile
Fixed up nested lists within the merge.
2016-07-09 16:36:49 +02:00
Joachim Fasting
a54eb3a49a Merge pull request #16791 from rasendubi/ycmd
ycmd: claim mainteinership
2016-07-08 02:34:36 +02:00
Tuomas Tynkkynen
21253ac835 lcov: 1.10 -> 1.12; maintain 2016-07-08 03:27:07 +03:00
Alexey Shmalko
41a8dc7f0b
ycmd: claim mainteinership
I've added the package originally.
2016-07-08 02:40:33 +03:00
mimadrid
2b7458144f
universal-ctags: init at 2016-07-06 2016-07-07 12:09:18 +02:00
Rok Garbas
fe2468b88c pypi2nix: 1.1.0 -> 1.2.0 2016-07-07 02:11:23 +02:00
Peter Simons
6a6b8fa36f cabal2nix: update to version 2.0 from Hackage
I've realized that publishing updates to Hackage is far easier than
publishing updates in Nixpkgs, and since all Hackage updates show up in
Nix automatically I've decided to go back to publishing cabal2nix on
Hackage again.

Unfortunately, this means that I'll have to change the version numbering
scheme to comply with the expectations of the Haskell PVP (which is used
by Stackage), so the new version 2.0 looks like a downgrade to Nix,
which used to have version 20160406. :-(

If in doubt, run "nix-env -u --always" to force the update. I am sorry
about the inconvenience.
2016-07-05 23:45:41 +02:00
Tuomas Tynkkynen
c6a641eb07 Merge pull request #16687 from vrthra/dejagnu
dejagnu: 1.5.3 -> 1.6
2016-07-05 03:45:14 +03:00
Joachim Fasting
89523c117b Merge pull request #16706 from vrthra/cweb
cwebbin: ensure binaries go to the right destddir
2016-07-04 19:19:28 +02:00
Rahul Gopinath
322795ab92 cwebbin: ensure binaries go to the right destddir 2016-07-04 09:55:36 -07:00
Joachim Fasting
173fbeef42 Merge pull request #16679 from vrthra/cweb
cweb: init at 22p
2016-07-04 18:15:51 +02:00
mimadrid
a3581f802e strace: 4.11 -> 4.12 2016-07-04 12:43:21 +02:00
Rahul Gopinath
179275cd70 dejagnu: 1.5.3 -> 1.6 2016-07-03 21:54:56 -07:00
Rahul Gopinath
5dade2d296 cweb: init at 22p 2016-07-03 14:54:12 -07:00
Rahul Gopinath
f3da2e5bac tie: init at 2.4 2016-07-03 13:47:53 -07:00
Joachim Fasting
fa3a410027 Merge pull request #16647 from holidaycheck/fix-galen-on-nixos
galen: fix on nixos
2016-07-02 14:03:52 +02:00
Tobias Pflug
6ed9cd9b00 galen: fix on nixos
overwritten phases omitted patchShebangs from being called so
the galen wrapper still contained `#!/usr/bin/bash`.
2016-07-01 16:43:26 +02:00
Peter Simons
a7e33a1a1e cabal2nix: update to version 20160613-10-g57dddc7 2016-07-01 12:01:03 +02:00
Tim Steinbach
e00c572698 gradle: 2.13 -> 2.14 2016-07-01 02:23:28 +00:00
zimbatm
7298dd8cca ronn: init at 0.7.3 2016-06-30 11:09:06 +01:00
Vladimír Čunát
3afa246038 Merge branch 'staging'
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
Rok Garbas
d9036a02b5 pypi2nix: 1.0.0 -> 1.1.0 2016-06-29 01:48:38 +02:00
Joachim Fasting
96a3bbd86f
Revert "Merge pull request #16507 from vrthra/unifdef"
This reverts commit cab28503ad, reversing
changes made to 5313f1096a (but retaining
the meta updates).

The update to 2.11 breaks the darwin toolchain, see discussion at
https://github.com/NixOS/nixpkgs/pull/16507

Once the issues with 2.11 are worked out, this revert can be reverted.
2016-06-28 18:53:39 +02:00
Edward Tjörnhammar
4eb08c560d Merge pull request #16553 from cko/typesafe_activator
activator: 1.3.5 -> 1.3.10
2016-06-28 10:10:14 +02:00
Austin Seipp
de6977ffe3 unifdef: set platforms to unix, not linux
Apparently, Darwin evaluation is somehow busted without this, although
I can't verify it. Reported by @matthewbauer on IRC. I'll take the
blame if this somehow makes life worse.

/cc @vrthra as maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-06-28 04:39:54 +00:00
Christine Koppelt
5e226cd66e activator: 1.3.5 -> 1.3.10 2016-06-27 19:13:22 +02:00
Arseniy Seroka
a5b3517fd8 Merge pull request #16536 from vrthra/cgdb
cgdb: 0.6.7 -> 0.6.8
2016-06-27 16:44:59 +03:00
Rahul Gopinath
021dd6a5f6 waf: 1.8.19 -> 1.9.0 2016-06-26 21:59:23 -07:00
Rahul Gopinath
cae58e3d26 objconv: 1.0 -> 2.16 (#16538) 2016-06-27 03:57:45 +02:00
Rahul Gopinath
e45ed9e780 toluapp: 1.0.92 -> 1.0.93 (#16539) 2016-06-27 03:57:10 +02:00
Rahul Gopinath
601d4f5523 cflow: 1.4 -> 1.5 (#16535) 2016-06-27 01:24:49 +02:00
Rahul Gopinath
c3d10d6d0d cgdb: 0.6.7 -> 0.6.8 2016-06-26 16:21:06 -07:00
Wei Tang
bc9657ec30 arcanist: 20150817 -> 20160516
Fixes #15505.
2016-06-26 23:31:46 +02:00
Joachim Fasting
ee6dd13c01 Merge pull request #16508 from vrthra/tcptrack
tcptrack: 1.4.2 -> 1.4.3
2016-06-26 19:16:45 +02:00
Rahul Gopinath
a7f7449ac9 tcptrack: 1.4.2 -> 1.4.3 2016-06-26 09:35:34 -07:00
Rahul Gopinath
c6980b20e4 unifdef: 2.6 -> 2.11 2016-06-25 18:34:57 -07:00
Rahul Gopinath
586a9c0d9c gnumake: Allow guile extension language as an optional feature 2016-06-23 09:55:54 -07:00
Jussi Mäki
d87455a099 pypi2nix: Use pypi mirror (#16451) 2016-06-23 12:35:29 +02:00