Commit graph

3799 commits

Author SHA1 Message Date
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02: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
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
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
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
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