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
Tadas Barzdzius
148dcf4d1c
Vagrant: 1.7.3 -> 1.7.4 (ZHF)
2015-07-21 19:08:15 +03:00
Luca Bruno
bfa5df6a5e
pahole: fix build (ZHF)
2015-07-21 16:01:20 +02:00
Austin Seipp
f07d5a244f
nixpkgs: ninja 1.5.3 -> 1.6.0
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:34 -05:00
Austin Seipp
8d7dd4cf53
nixpkgs: re2c 0.14.2 -> 0.14.3
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
William A. Kennington III
2ad250f4fa
Merge branch 'staging.next' into staging.upstream
2015-07-19 02:21:28 -07:00
Vladimír Čunát
9a80550cc4
Merge branch 'staging', discussion #8844
2015-07-19 08:09:29 +02:00
Stewart Mackenzie
f46bbbce49
boot: correct sha256
2015-07-19 02:33:43 +08:00
William A. Kennington III
de8e6f6021
Merge branch 'staging.upstream' into staging.next
2015-07-17 14:34:37 -07:00
William A. Kennington III
f74c74ec40
swig3: 3.0.2 -> 3.0.6
2015-07-17 14:15:36 -07:00
William A. Kennington III
038d29121e
swig2: 2.0.11 -> 2.0.12
2015-07-17 14:15:23 -07:00
Vladimír Čunát
9f37e91ec5
Merge master into staging
...
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
1e2718ed51
lsof: 4.88 -> 4.89
2015-07-15 12:25:21 -07:00
Alexander Flatter
a475f99304
Add phantomjs2
...
This builds PhantomJS 2 from source in contrast to PhantomJS 1, for
which static binary builds are available.
2015-07-15 21:14:15 +02:00
William A. Kennington III
333f145d76
Merge branch 'master.upstream' into staging.upstream
2015-07-13 15:11:31 -07:00
Matthias Beyer
7e3c95a0b8
sqlitebrowser: init at 3.7.0
...
[Bjørn: add name=... to fetchzip.]
2015-07-13 22:11:30 +02:00
lethalman
54f308c740
Merge pull request #8746 from bosu/add-pahole
...
pahole: init at 1decb1b
2015-07-13 16:37:47 +02:00
Boris Sukholitko
c59818f630
pahole: init at 1decb1b
2015-07-13 17:31:06 +03:00
Arseniy Seroka
5d9f0e60f5
Merge pull request #8772 from retrry/vagrant-update
...
vagrant: 1.7.2 -> 1.7.3
2015-07-12 22:13:51 +03:00
Tadas Barzdzius
4338031c59
vagrant: 1.7.2 -> 1.7.3
2015-07-12 14:27:17 +03:00
Jude Taylor
43c72cb6af
add security-tool
2015-07-10 10:41:07 -07:00
Robert Irelan
51972d427e
cargo: 2015-05-13 -> 0.3.0
...
Rename cargo to use a version number rather than a date because Cargo
has started releasing packages using version numbers.
2015-07-09 22:56:51 -07:00
Robert Irelan
e6ee86b941
cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from nix-env
...
Update snapshot to avoid rust-lang/cargo#976 , which otherwise breaks the
build.
Also move the `cargoSnapshot` derivation inside a set in
pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot`
packages from `nix-env -qa`, since it's only used to build the `cargo`
package.
2015-07-09 21:14:55 -07:00
Edward Tjörnhammar
2c327ca48e
activator: 1.3.2 -> 1.3.5
2015-07-10 00:23:48 +02:00
Pascal Wittmann
ad41a600e5
oprofile: update from 0.9.9 to 1.0.0 (ZHF)
...
fixes the build with recent versions of binutils
2015-07-09 13:18:21 +02:00
William A. Kennington III
7cda24c01e
Merge branch 'master.upstream' into staging.upstream
2015-07-08 14:11:16 -07:00
Jaka Hudoklin
4b1cfd17a8
Merge pull request #8680 from offlinehacker/pkgs/compass/add
...
Add compass, stylesheet authoring environment
2015-07-08 12:17:19 +02:00
Austin Seipp
afb7655c68
nixpkgs: arcanist 20150525 -> 20150707
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-07 09:37:50 -05:00
Jaka Hudoklin
acc995cf41
Add compass, stylesheet authoring environment
2015-07-07 12:11:58 +02:00
William A. Kennington III
d605663ae2
Merge branch 'master.upstream' into staging.upstream
2015-07-05 13:06:02 -07:00
Michael Raskin
b280d6cbc7
scons: update 2.3.4 -> 2.3.5
2015-07-05 00:32:53 +03:00
Vincent Laporte
06efb2e937
chefdk: fix build
2015-07-04 00:39:44 +02:00
Arseniy Seroka
afa1f5ba22
Merge pull request #8586 from vbgl/ocaml-updates
...
Ocaml package updates
2015-07-02 12:06:29 +03:00
Tobias Geerinckx-Rice
4023da6237
ccache: drop unnecessary perl dependency
...
Backport a one-line patch to remove the test suite's dependency on
perl, which, while not exactly heavy, is unnecessary.
2015-07-02 03:35:35 +02:00
William A. Kennington III
7eae48871f
Merge branch 'master.upstream' into staging.upstream
2015-07-01 13:38:17 -07:00
Vincent Laporte
2663f24a48
ocp-index: 1.1.1 -> 1.1.2
2015-07-01 20:23:19 +02:00
Pascal Wittmann
f5c91c445f
checkstyle: update from 6.8 to 6.8.1
2015-07-01 20:21:33 +02:00
William A. Kennington III
612f0bdd67
Merge branch 'master.upstream' into staging.upstream
2015-06-30 23:58:07 -07:00
Pascal Wittmann
439ce0d07d
checkstyle: update from 6.7 to 6.8
2015-06-29 12:50:34 +02:00
William A. Kennington III
ef253212f4
Merge branch 'master.upstream' into staging.upstream
2015-06-26 17:25:49 -07:00
Pascal Wittmann
8c4fcc87f8
autobuild: 3.5 -> 5.3
2015-06-26 17:40:09 +02:00
Thomas Tuegel
a8c52d0958
Merge branch 'master' into staging
2015-06-25 09:15:05 -05:00
Vincent Laporte
2727ecec37
js_of_ocaml: propagate camlp4 dependency
2015-06-25 08:55:30 +02:00
Jascha Geerds
ee2c3058fc
Merge pull request #8489 from ktosiek/d-feet-0.3.10
...
d-feet: 0.3.9 -> 0.3.10
2015-06-24 21:28:04 +02:00
Tomasz Kontusz
5c4a6b59c3
d-feet: 0.3.9 -> 0.3.10
...
Also added license. This is based on COPYING inside the archive.
2015-06-24 20:57:03 +02:00
Pascal Wittmann
c8e66bb9ac
autoconf-archive: update from 2014.10.15 to 2015.02.25
...
and use mirror://
2015-06-23 23:49:33 +02:00
Arseniy Seroka
266531b5b0
Merge pull request #8422 from travisbhartwell/update/atom-shell-to-electron
...
atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
2015-06-23 18:54:22 +03:00
William A. Kennington III
282d03befa
Merge branch 'master.upstream' into staging.upstream
2015-06-22 10:57:36 -07:00
Michael Raitza
7907a8bcba
dialog: init at 1.2-20150225, closes #8457
...
Generate ncurses dialogs from shell scripts.
2015-06-22 18:11:05 +02:00
Jascha Geerds
3f66bb7ff2
Add myself as maintainer
2015-06-22 08:26:09 +02:00
Travis B. Hartwell
1682bd707a
electron: Added myself as maintainer.
...
Per https://github.com/NixOS/nixpkgs/pull/8422#issuecomment-113695261
2015-06-20 12:43:10 -06:00
Andrew Kelley
55262f98b6
rucksack: init at 3.1.0
2015-06-20 02:06:20 -07:00
Travis B. Hartwell
caa216b640
atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
...
Added systemd to buildEnv path because of new libudev dependency.
2015-06-19 15:32:12 -06:00
Jude Taylor
2c79dcd5ce
darwin purity: pkgconfig
2015-06-19 12:56:39 -07:00
Vladimír Čunát
61596bf405
Merge #8363 : pure-darwin stdenv
2015-06-18 22:38:08 +02:00
Jude Taylor
fa9c81f694
pure darwin stdenv
2015-06-18 12:37:41 -07:00
Austin Seipp
c3fcd5ecb7
nixpkgs: Remove bunk 'infer' expression
...
This was accidentally committed because I'm a goof - see
1ee742b0ef
.
Thanks to ftrvxmtrx on IRC for spotting.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-18 11:37:51 -05:00
Vincent Laporte
2583b22573
frama-c: fix hash, closes #8308
2015-06-18 11:47:34 +02:00
Tobias Geerinckx-Rice
98b2d7b727
Separate nativeBuildInputs where maintainers |= nckx
2015-06-17 22:21:32 +02:00
William A. Kennington III
8e19ac8d7c
Merge branch 'master.upstream' into staging.upstream
2015-06-17 11:57:40 -07:00
Pascal Wittmann
8437f039e3
help2man: update from 1.46.6 to 1.47.1
2015-06-16 12:02:00 +02:00
Luca Bruno
aa800fa0fe
Merge branch 'master' into staging
2015-06-15 09:56:29 +02:00
Eric Merritt
dcffd28527
ocp-build: upgrade to 1.99.9-beta
...
This also allows ocp-build to build for ocaml 4.02 and greater
2015-06-14 13:33:18 -07:00
Austin Seipp
1ee742b0ef
nixpkgs: afl 1.80b -> 1.83b
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 14:28:00 -05:00
Pascal Wittmann
23393964bb
intel-gpu-tools: update from 1.10 to 1.11
2015-06-14 21:24:24 +02:00
Michael Raskin
b32174dcc6
Update SlimerJS
2015-06-14 11:21:36 +03:00
Michael Raskin
2fe7bf8d55
Update CL-Launch
2015-06-14 11:21:27 +03:00
William A. Kennington III
954801a9a8
Merge branch 'master.upstream' into staging.upstream
2015-06-12 13:47:46 -07:00
Rok Garbas
0860826795
cygwin: cmake expression should not change for linux
2015-06-12 12:17:12 +02:00
Rok Garbas
277c263c1e
cygwin: update patch for cmake 3.2.2
2015-06-12 12:17:12 +02:00
Rok Garbas
85b7673e92
cygwin: turn off tests for swig since they depend on tcl (which i havent yet figure out how to build)
2015-06-12 12:17:12 +02:00
Peter Simons
4d404fd6a4
ihaskell-wrapper: avoid use of /bin/sh
...
https://github.com/NixOS/nixpkgs/issues/183
2015-06-12 10:50:40 +02:00
Tobias Geerinckx-Rice
2156937166
include-what-you-use 3.6 -> 0.4 (sic)
...
Not a downgrade. Upstream's weird.
2015-06-12 02:27:53 +02:00
Rok Garbas
e1683eeff1
lsof: url is behind auth. changed downloaded url for lsof
2015-06-11 14:54:30 +02:00
Domen Kožar
a06bb18ce5
Merge pull request #8274 from k0ral/lsof
...
lsof: 4.87 -> 4.88
2015-06-11 11:26:18 +02:00
Pascal Wittmann
2700715567
global: update from 6.4 to 6.5
2015-06-11 10:46:57 +02:00
Eelco Dolstra
4970574409
Merge remote-tracking branch 'origin/gcc-4.9' into staging
...
Conflicts:
pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
Eelco Dolstra
4a57b07653
Merge remote-tracking branch 'origin/master' into staging
2015-06-11 00:18:24 +02:00
koral
0ac1de60e9
lsof: 4.87 -> 4.88
2015-06-10 16:34:45 +00:00
Tomasz Kontusz
bbf0f7e16f
Bump d-feet to 0.3.9
2015-06-08 00:10:48 +02:00
William A. Kennington III
9d6555dc0a
Merge branch 'master.upstream' into staging.upstream
2015-06-06 12:04:42 -07:00
Vincent Laporte
142400b8d5
ocaml-merlin: update from 2.1.2 to 2.2
2015-06-06 17:42:24 +02:00
Arseniy Seroka
70b5e51456
Merge pull request #8178 from jagajaga/fix/versions
...
fix: add missing versions
2015-06-06 00:22:10 +03:00
Peter Simons
7acb77ca2b
cabal2nix: run "git reset --hard" to clean up the source to avoid the "-dirty" tag
2015-06-05 12:42:34 +02:00
Rok Garbas
9e99a66c24
cygwin: make flex building on cygwin
2015-06-05 00:39:29 +02:00
Arseniy Seroka
daf4ec39a5
fix: add missing versions
2015-06-04 23:34:14 +03:00
Eelco Dolstra
3ede0a64a2
make: Don't segfault if we can't get a tty name
...
This happened in VM builds:
make flags: SHELL=/nix/store/dbxpkswwc7rh6g1iy6dwqklzw39hihb1-bash-4.3-p33/bin/bash
/nix/store/jm26xg0h3jcrg4bbrwiqx3jpirscdk0p-stdenv/setup: line 658: 5957 Segmentation fault make ${makefile:+-f $makefile} ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} $makeFlags "${makeFlagsArray[@]}" $buildFlags "${buildFlagsArray[@]}"
2015-06-04 19:47:34 +02:00
Peter Simons
c659105ef8
cabal2nix: get rid of the '-dirty' version suffix
...
The fetchgit builder performs some freak magic in the name of deterministic
hashes that screws up git's idea of a clean directory tree.
2015-06-04 13:33:57 +02:00
lethalman
219b9a63ad
Merge pull request #8135 from sofuture/fix-goimports-build
...
Fix goimports build
2015-06-03 10:47:55 +02:00
jzellner
be03ca9262
fix goimports build, use buildGoPackage
2015-06-02 11:59:40 -06:00
Eelco Dolstra
e7f1038798
Fix typo in last merge
2015-06-01 20:09:31 +02:00
Eelco Dolstra
553abf71ba
Merge remote-tracking branch 'origin/staging' into gcc-4.9
...
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/libraries/wayland/default.nix
pkgs/development/tools/build-managers/cmake/default.nix
pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
codyopel
fcf850c99e
sassc: 3.2.1 -> 3.2.4
2015-06-01 01:28:18 -04:00
Pascal Wittmann
ed9455838c
checkstyle: update from 6.6 to 6.7
2015-05-31 20:25:33 +02:00
Peter Simons
c55ca3fd0b
cabal2nix: update to version 20150531
...
This update adds support for bash completion.
2015-05-31 18:31:26 +02:00
Tobias Geerinckx-Rice
21015ea82f
Add bin_replace_string: edit precompiled binaries
2015-05-30 21:09:26 +02:00
Pascal Wittmann
1d30557516
Fixed meta.license: s/licence/license
2015-05-30 15:19:05 +02:00
Pascal Wittmann
24d2849dba
gtk-doc: update from 1.23 to 1.24
2015-05-30 13:48:53 +02:00
Peter Simons
99273a6716
Merge pull request #8047 from nckx/master
...
Don't use "with licenses;" for single licences
2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice
158e1cfdd0
Don't use "with licenses;" for single licences
...
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Pascal Wittmann
7822640a18
yodl: update from 3.05.00 to 3.05.01
2015-05-28 19:10:52 +02:00
Pascal Wittmann
f675c4d90d
icmake: update from 7.22.00 to 7.22.01
2015-05-28 18:57:32 +02:00
Pascal Wittmann
38bc63c605
help2man: update from 1.46.5 to 1.46.6
2015-05-28 18:56:12 +02:00
Pascal Wittmann
b57097b2fe
fswatch: update from 1.4.6 to 1.4.7
2015-05-28 18:54:35 +02:00
Pascal Wittmann
1a3860e95a
checkstyle: update from 6.5 to 6.6
2015-05-28 18:49:06 +02:00
Sander van der Burg
3fa15c820f
doclifter: add new package
2015-05-28 16:13:47 +00:00
Rok Garbas
ea3748d519
cygwin: help2man patch for cygwin
2015-05-28 14:15:47 +02:00
Florian Friesdorf
90a97d32df
cygwin cmake
2015-05-28 10:53:36 +02:00
Florian Friesdorf
f33f2a7e82
cygwin: disable gnumake check because of hanging test
2015-05-28 10:53:35 +02:00
Marko Durkovic
c4efe32d4d
cygwin: pkgconfig
2015-05-28 10:53:35 +02:00
Austin Seipp
4793f2c7d3
nixpkgs: arcanist 20150412 -> 20150525
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-05-27 16:36:26 -05:00
Tobias Geerinckx-Rice
b2d7f4b1ba
Use common licence attributes from lib/licenses.nix
...
Many (less easily automatically converted) old-style strings
remain.
Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.
Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Arseniy Seroka
6c9ac3f967
Merge pull request #8024 from ragnard/update-boot-version
...
boot: Update version from 2.0.0-rc14 to 2.0.0.
2015-05-27 22:43:15 +03:00
Ragnar Dahlén
9cb63367dc
boot: Update version from 2.0.0-rc14 to 2.0.0.
2015-05-27 20:39:17 +01:00
lethalman
257c05fa82
Merge pull request #7622 from jzellner/master
...
add goimports package
2015-05-27 10:57:23 +02:00
vbgl
2857d5d7a8
Merge pull request #7823 from ericbmerritt/ocaml-enhancements
...
Ocaml enhancements
2015-05-26 23:52:32 +02:00
Edward Tjörnhammar
f02284a361
activator: add version 1.3.2
2015-05-26 20:56:43 +02:00
Antoine R. Dumont
a12dd8f6a1
Upgrade to latest stable
...
Upgraded the dependency to oracle's jdk8.
2015-05-26 19:30:19 +02:00
Alexander Flatter
7d9724057c
Update heroku toolbelt to 3.32.0
2015-05-26 13:06:34 +02:00
Alexander Flatter
be71c0871c
Add meta information to heroku toolbelt
2015-05-26 13:06:34 +02:00
Alexander Flatter
d2b906c771
Add heroku-client
2015-05-26 13:05:53 +02:00
Peter Simons
d808f5b3e6
cabal2nix: update to version 20150525
2015-05-25 15:00:07 +02:00
Eric Merritt
8751d1ea1a
rename ocaml_typeconv to type_conv
...
The actual name of the package is type_conv
(https://github.com/janestreet/type_conv ). Having it named
ocaml_typeconv adds a verbosity that isn't required and actually makes
the package harder to find.
2015-05-24 12:32:45 -07:00
Eric Merritt
56627d5444
ocaml-opam: the sha hash of 1.2.2 changed
...
This is a bit scary. The sha of 1.2.2 changed, causing a crash on
download of the url. This updates to the current sha. Opam maintainer
why, oh why, do you change a released version without a version bump??
2015-05-24 12:31:44 -07:00
Boris Sukholitko
1da49e714d
Upgrade to selenium 2.45
...
Without the upgrade, firefox driver is unusable, due to:
https://code.google.com/p/selenium/issues/detail?id=8399
2015-05-22 17:40:18 +03:00
Sander van der Burg
e612ea59c0
rman: add expression
2015-05-22 10:04:44 +00:00
Tobias Geerinckx-Rice
5d5044b2ec
Use mirror:// URIs for ftp.debian.org
...
Provide a more robust experience for users with horrible network
hardware (me).
2015-05-22 10:39:27 +02:00