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