1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Commit graph

3869 commits

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