Commit Graph

3705 Commits

Author SHA1 Message Date
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
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
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