Commit graph

2965 commits

Author SHA1 Message Date
William A. Kennington III 8c6088c0ce gocode: Move to go-packages 2015-09-05 00:15:02 -07:00
Peter Simons fcb0bdbaa0 Merge pull request #9639 from k0ral/scons
scons: 2.3.5 -> 2.3.6
2015-09-03 21:08:32 +02:00
koral bfe09b88fc scons: 2.3.5 -> 2.3.6 2015-09-03 17:37:56 +00:00
Peter Simons 65a415a1b2 cabal2nix: update to version 20180903 2015-09-03 17:53:24 +02:00
Daniel Brockman 06b6648770 flow: 0.13.1 -> 0.14.0, fixes #9321 2015-09-03 13:51:08 +02:00
Peter Simons ada81b80fd cabal2nix: update to version 20150824-66-gd281a60
This patch fixes https://github.com/NixOS/nixpkgs/issues/9599.
2015-09-02 17:46:39 +02:00
Thomas Strobel 616aa2bdda ocaml modules: fix some CamelCase and under_scores 2015-09-02 09:14:59 +02:00
Eelco Dolstra 6cadec8906 ant: Update to 1.9.6 2015-09-01 12:00:04 +02:00
Tobias Geerinckx-Rice cfe12c7edd yodl: Sourceforge -> (fetchFrom)GitHub
Cosmetic tweaks; maintain.

CC@ pSub
2015-09-01 05:42:12 +02:00
Tobias Geerinckx-Rice 687d60ec73 icmake: Sourceforge -> (fetchFrom)GitHub
Also add myself as a maintainer.

CC@ pSub
2015-09-01 05:28:53 +02:00
Tobias Geerinckx-Rice f4193da388 flexc++: 2.02.00 -> 2.03.00
Good-bye Sourceforge, hello (fetchFrom)GitHub. Please stay nice.
2015-09-01 03:28:19 +02:00
Peter Simons b2c3c58476 cabal2nix: add myself as a maintainer 2015-08-30 12:49:45 +02:00
Aycan iRiCAN 523cd395c7 cabal2nix: fixed sha256 hash 2015-08-30 11:47:25 +03:00
Eelco Dolstra 4e41b64511 valgrind: Separate doc output 2015-08-27 19:07:44 +02:00
Luca Bruno c91d360cec pidginsipe: add nss and nspr (ZHF) 2015-08-27 12:29:45 +02:00
Bjørn Forsman 3c67f86211 openocd: enable support for CMSIS-DAP debuggers
I.e., add 'hidapi' to buildInputs. Build tested.
2015-08-26 22:06:08 +02:00
Bjørn Forsman 1a13d28151 openocd: 0.8.0 -> 0.9.0
Build tested.
2015-08-26 22:01:07 +02:00
Peter Simons b106fbfb4f cabal2nix: update to version 20150824 2015-08-25 17:15:41 +02:00
Domen Kožar e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Tobias Geerinckx-Rice e8a55a43cf ccache: update 3.2.2 -> 3.2.3 2015-08-25 05:03:05 +02:00
Thomas Tuegel 90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Thomas Tuegel 06717667cc Revert "autogen: don't write temp files outside build dir"
This reverts commit 1ea4ea1375.
2015-08-23 10:28:48 -05:00
Thomas Tuegel 1ea4ea1375 autogen: don't write temp files outside build dir 2015-08-23 10:26:29 -05:00
Desmond O. Chang ef721079ca gradle: 2.2.1 -> 2.6 2015-08-23 12:07:16 +02:00
Aycan iRiCAN afe6f05310 cabal2nix: fixed sha256 hash
I was getting below error:
output path ‘/nix/store/i73iz0id6ap6qg1p6jaqadl053h2cgfz-cabal2nix-9f58996’ should have r:sha256 hash ‘1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d’, instead has ‘0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv’
2015-08-22 11:04:09 +03:00
William A. Kennington III 64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Jude Taylor 65dd349574 update mysteriously varying git hashes 2015-08-21 12:00:35 -07:00
Eelco Dolstra aba76f23a5 Revert "add Darwin's flavor of lsof"
This reverts commit 7024b4dc62. It
breaks evaluation (possibly related to earlier reverts):

http://hydra.nixos.org/build/24887643
2015-08-21 12:05:06 +02:00
Michael Raskin a2b718fc80 Switch to the git version for now to get Gecko 40 compatibility 2015-08-21 09:28:23 +03:00
Eelco Dolstra 6769633b64 autogen: Fix build outside of chroot
http://hydra.nixos.org/build/24870256
2015-08-20 20:42:41 +02:00
William A. Kennington III 2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Jascha Geerds 50d90a2538 gtkdialog: Add missing dependency on hicolor_icon_theme (#9369) 2015-08-20 16:03:58 +02:00
William A. Kennington III 901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
William A. Kennington III c3592084cf golint: Update to 2015-06-23 2015-08-19 13:51:09 -07:00
Moritz Ulrich 2ffc2099be leiningen: 2.5.1 -> 2.5.2. 2015-08-19 12:25:50 +02:00
William A. Kennington III 2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Austin Seipp 55e5bd4e9b nixpkgs: arcanist 20150707 -> 20150817
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-17 17:18:10 -05:00
William A. Kennington III a106080623 Merge branch 'master.upstream' into staging.upstream 2015-08-14 13:22:00 -07:00
William A. Kennington III 6fccef2be0 cmake: 3.3.0 -> 3.3.1 2015-08-14 00:12:59 -07:00
William A. Kennington III 952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
William A. Kennington III 257db17ee9 Revert "Revert "texinfo: 5.2 -> 6.0""
This reverts commit dc74a81129.

This doesn't actually break gcc.
2015-08-13 11:33:00 -07:00
Szczyp cbe6badab9 rhc: init at 1.36.4
OpenShift client tools
Add szczyp as a maintainer
2015-08-13 18:02:55 +02:00
William A. Kennington III 78377e02c5 autogen: 5.18 -> 5.18.5 2015-08-12 17:02:14 -07:00
Eelco Dolstra dc74a81129 Revert "texinfo: 5.2 -> 6.0"
This reverts commit b1ed04ad1d. It breaks gcc:

http://hydra.nixos.org/build/24651204
2015-08-12 13:25:15 +02:00
Rickard Nilsson cef8f0180d Merge pull request #9213 from j-keck/sbt0.13.9
sbt: 0.13.8 -> 0.13.9
2015-08-12 11:02:42 +02:00
j-keck 5e7d2e2003 sbt: 0.13.8 -> 0.13.9 2015-08-12 07:45:25 +02:00
William A. Kennington III b1ed04ad1d texinfo: 5.2 -> 6.0 2015-08-10 23:42:17 -07:00
William A. Kennington III 6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Peter Simons e8e206aa42 Merge pull request #9148 from Profpatsch/sbt-java-home
wrap sbt with $JAVA_HOME
2015-08-09 00:45:44 +02:00
Profpatsch 062cdfb3a1 sbt: add JAVA_HOME to sbt script 2015-08-08 20:08:00 +02:00
Michael Raskin bd09d75b96 CL-Launch: 4.1.3.3 -> 4.1.4 2015-08-08 21:01:31 +03:00
Pascal Wittmann 6f5c2ec311 checksyle: update from 6.8.2 to 6.9 2015-08-08 00:08:50 +02:00
Peter Simons 3dbfcdc3d4 cabal2nix: make the package visible from the top-level
This means that "nix-env -i cabal2nix" suffices to install this package.
2015-08-07 23:08:13 +02:00
Peter Simons 13dc24f5c3 cabal2nix: update to version 20150807-6-g9f58996
The generated shell.nix file accepts a string argument called "compiler" that
determines the package set used to instantiate the generated expression. For
example, running "nix-shell --argstr compiler ghc7102" would evaluate the build
inside of "pkgs.haskell.packages.ghc7102". Earlier versions of cabal2nix had the
current default compiler hard-coded in the expression, but after this change this
is no longer the case. When "compiler" remains unspecified, it defaults to
"default", and this value causes evaluation in "pkgs.haskellPackages", which is
the package set most people would like to use by default. That change has to
benefits:

 1) Generated expression no longer contain any particular compiler version. The
    choice of the default compiler depends on the version of Nixpkgs that's used
    to build the expression.

 2) When the default compiler is used, overrides configured for the default
    package set apply, which was not the case in earlier versions.
2015-08-07 23:08:13 +02:00
William A. Kennington III 4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Peter Simons 29fed6f834 cabal2nix: update to version 20150807
This update greatly enhances the accuracy with which dependencies are expressed
in the generated Nix files. Previous versions distinguished dependencies for
building ("buildDepends") and testing ("testDepends"). This distinction didn't
apply to system packages or build tools, however: the fields "extraLibs" and
"buildTools" applied to the entire build. This meant that dependencies required
only for testing would be pulled in regardless of whether the test were
actually being run, etc.

These days, we distinguish dependencies for libraries, executables, and tests,
and for each of those types we distinguish dependencies on Haskell libraries,
system libraries, pkgconfig libraries, and build tools. This gives us a
whopping 12 new attributes

    xxxHaskellDepends
    xxxSystemDepends
    xxxPkgconfigDepends
    xxxToolDepends

where "xxx" is any of "library", "executable", or "test".

The old dependency attributes are no longer generated by cabal2nix. The generic
builder in Nixpkgs still accepts them, though, for the sake of backwards
compatibility. This means that you don't have to re-generate all your build
expressions with the new version, but you *should*.
2015-08-07 15:03:58 +02:00
William A. Kennington III 793cbaedf4 cmake: 3.2.2 -> 3.3.0 2015-08-06 10:15:04 -07:00
lethalman dad54b36fb Merge pull request #9008 from philandstuff/fix-bazel
Fix bazel package
2015-08-06 11:47:54 +02:00
lethalman 00821f4046 Merge pull request #9066 from Bevaz/ccache-isGNU
ccache: set attribute isGNU = true
2015-08-06 11:46:02 +02:00
vbgl b8a1e16f81 Merge pull request #9028 from samuelrivas/update-utop-and-camlp4
Update utop and camlp4
2015-08-06 09:11:34 +02:00
Samuel Rivas 37d0d8ac74 utop: 1.15 -> 1.17
Version 1.18 doesn't compile cleanly currently, I need to debug what is going on
there
2015-08-06 08:06:51 +02:00
Samuel Rivas d516f12dba camlp4: 4.02.0+1 -> 4.02+6
* Remove unneeded substitution in postConfigure
   This was fixed here: 81ed5cf2e8

 * camlp4: use fetchzip

It is considered more reliable than fetchurl
2015-08-06 08:06:16 +02:00
William A. Kennington III 0ecc61b4d7 Merge branch 'master.upstream' into staging.upstream 2015-08-05 16:24:57 -07:00
Pascal Wittmann d7a6e25355 Merge pull request #8683 from aflatter/phantomjs2
Add phantomjs2
2015-08-05 15:08:30 +02:00
Pascal Wittmann bb04c579c3 fswatch: update from 1.4.7 to 1.5.0 2015-08-05 14:44:41 +02:00
Pascal Wittmann 454dc664a6 checkstyle: update from 6.8.1 to 6.8.2 2015-08-05 14:44:41 +02:00
Ragnar Dahlén 25bad2be17 boot: 2.0.0 -> 2.2.0 2015-08-05 11:54:40 +01:00
William A. Kennington III 926f073f55 Merge branch 'master.upstream' into staging.upstream 2015-08-04 15:32:43 -07:00
Arseniy Seroka bba10d8be4 Merge pull request #9039 from Bevaz/ccache-links
ccache: create symlinks to gcc utils in ccache-links bin directory
2015-08-04 15:55:35 +03:00
William A. Kennington III a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
Nikolay Amiantov 4dde32b4f2 gradle: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:49 +03:00
Nikolay Amiantov 52fb36e7e0 maven: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:45 +03:00
Robert Scott aefc8b3ddf elfutils: upgrade to 0.163 due to security
... vaguely mentioned by upstream, see e.g. FEDORA-2015-11380.
Close #9084.
2015-08-02 09:36:25 +02:00
William A. Kennington III 09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Jude Taylor 7024b4dc62 add Darwin's flavor of lsof 2015-07-31 11:35:42 -07:00
Anton Fedotov 09b611ee8e ccache: set attribute isGNU = true 2015-07-31 16:58:03 +03:00
Anton Fedotov 16aadf2d79 ccache: create symlinks to gcc utils in ccache-links bin directory 2015-07-31 15:56:02 +03:00
Eelco Dolstra 6310a9a3be gnum4: Fix impurity in shell handling
If gnum4 is built outside of a chroot, it will decide to use
/run/current-system/sw/bin/sh as the shell for "syscmd". (It gets this
path via "getconf PATH". Maybe our Glibc shouldn't return that path,
at least not during Nix builds...) If such a build of gnum4 is
subsequently used *inside* a chroot, it won't work because
/run/current-system doesn't exist. So specify an explicit path to the
shell.
2015-07-31 04:13:08 +02:00
Tobias Geerinckx-Rice 6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
William A. Kennington III 7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Vladimír Čunát 862900e42e mass-replace deprecated usage of find -perm (Fixes #9044)
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
2015-07-30 10:30:17 +02:00
William A. Kennington III af6d8b5182 etcdctl: Use goPackages version of etcd
cc @cstrahan
2015-07-29 18:32:09 -07:00
William A. Kennington III aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
Vladimír Čunát af3261f7a2 lsof: use a pair of URLs to work when upstream updates
Fixes #9043 for future bumps.
2015-07-29 17:46:53 +02:00
Philip Potter 76dd430cd8 bazel: fix build, make compatible with openjdk
Bazel 981b7bc1 depends on protobuf-2.5 and won't work with 2.6 (and in
bbe84fe3d upgraded straight to protobuf 3.0.0-alpha3); this commit fixes
the dependency to depend on protobuf2_5 specifically.

The bazel compile.sh needs `which` on the PATH; so this commit adds that
as a dependency.

Setting JAVA_HOME to ${jdk} broke bazel when used with openjdk, with the
message:

    Problem with java installation: couldn't find/access rt.jar in /nix/store/z9vc0vzyzhnpl5l5inmqdnvdnbxmmmg7-openjdk-8u60b24

This is because if you set JAVA_HOME, bazel will look for rt.jar in
$JAVA_HOME/lib and $JAVA_HOME/jre/lib, but the nixpkgs openjdk
distribution puts rt.jar in ${jdk}/lib/openjdk/jre/lib for some reason.

To fix this, this commit uses the ${jdk.home} passthru value to use the
appropriate JAVA_HOME for the given jdk.

As bazel now works with openjdk, and openjdk is free while oraclejdk is
not, this commit changes the default jdk for bazel to openjdk.

Since this package didn't have a listed maintainer, I'm claiming it.
2015-07-28 20:38:44 +01:00
Jude Taylor 78e6b78bc6 fix source hashes for cabal2nix and bundler 2015-07-28 12:24:14 -07:00
Tobias Geerinckx-Rice 208bd8242d apktool: set sourceRoot
Otherwise installation fails with the message that unpacking produced
no directories (which is true).
2015-07-28 02:55:55 +02:00
vbgl 93ec36702e Merge pull request #9013 from lessrest/update-flow
flow: 0.1.0 -> 0.13.1
2015-07-27 13:38:18 +02:00
Daniel Brockman 322358db03 flow: 0.1.0 -> 0.13.1 2015-07-27 12:00:54 +02:00
Vladimír Čunát a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
Sergey Mironov 9944d92dff omniorb: add the expression 2015-07-23 20:42:35 +02:00
Eelco Dolstra e7c209e5a3 gdb: Update to 7.9.1 2015-07-23 18:31:54 +02:00
Arseniy Seroka 4588557d01 Merge pull request #8952 from taktoa/taktoa-guile
g-wrap: 1.9.13 -> 1.9.15 and guile-gnome: 2.16.1 -> 2015/01/23 git
2015-07-23 13:51:46 +03:00
Vladimír Čunát af2ab0b911 remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.

(cherry picked from commit 3064b6a0cc)
2015-07-23 11:53:18 +02:00
Remy Goldschmidt d2f923341a g-wrap: 1.9.13 -> 1.9.15 2015-07-23 04:13:03 -05:00
Franz Pletz 5955f815ef dfu-util: init at 0.8
Since the website and Sourceforge are currently down, the source tarball
is fetched from Debian mirrors.
2015-07-23 10:28:45 +02:00
Vladimír Čunát 2cacf77c13 Merge branch 'master' into staging 2015-07-22 22:33:55 +02:00
Vladimír Čunát 3064b6a0cc remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.
2015-07-22 19:40:12 +02:00
Ricardo M. Correia 205a6b894d cargo: workaround frequent hash mismatches due to #8567
For now, let's remove `leaveDotGit`. The only visible effect I could see
was that `cargo --version` won't report the git commit anymore, but
that's only a minor issue compared to the build breaking often.

Fixes #8566 and closes #8862.
2015-07-21 21:26:02 +02:00
lethalman b5fcbb9041 Merge pull request #8923 from retrry/vagrant-update
Vagrant: 1.7.3 -> 1.7.4 (ZHF)
2015-07-21 18:17:03 +02:00