3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2410 commits

Author SHA1 Message Date
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Ricardo M. Correia a94c0d2b0f racerRust: Update from 2015-01-07 -> 2015-01-20 2015-01-20 22:19:17 +01:00
Eelco Dolstra 83d9dd40f6 gdb: Don't pass guile
The configure script doesn't detect guile, so there is no sense in
having a build dependency on it:

checking for usable guile from /nix/store/hpnsswyh6qkjy5yvrf0a50k6cgm8cws8-pkg-config-0.28/bin/pkg-config... no
2015-01-20 16:00:29 +01:00
Eelco Dolstra f3ee32559d gdb: Update to 7.8.2 2015-01-20 15:52:11 +01:00
Pascal Wittmann 20d68c20e9 fswatch: update from 1.4.5.3 to 1.4.6 2015-01-20 13:02:45 +01:00
Edward Tjörnhammar 14f6ea9d3c ihaskell: be more paranoid about profile initialization 2015-01-19 21:11:04 +01:00
Moritz Ulrich e6e9a73424 Egg2nix: Bump to 0.5. 2015-01-19 15:43:25 +01:00
Vincent Laporte 763b2a7718 merlin: update from 2.0 to 2.1 2015-01-19 12:07:00 +01:00
Michael Raskin eee450779e Remove strange reference to coffee-script with two versions 2015-01-18 23:29:07 +03:00
Markus Kohlhase 73c966534a updated to v0.1.6 2015-01-18 23:23:50 +03:00
Markus Kohlhase cfb9e8b94d added sloc v0.1.5 2015-01-18 23:23:50 +03:00
Edward Tjörnhammar 2594999ced ihaskell: fix path to installedconf in wrapper 2015-01-17 01:26:18 +01:00
Michael Raskin 1e0d2a96b3 Bump allowed Firefox version for SlimerJS again, and with some reserve... 2015-01-16 12:18:38 +03:00
Pascal Wittmann 116fc8afc4 yodl: update from 3.04.00 to 3.05.00 2015-01-14 23:58:17 +01:00
Pascal Wittmann 8d322e0fee checkstyle: update from 6.1.1 to 6.2 2015-01-14 14:23:47 +01:00
Vincent Laporte 0a0b46a9b0 ocp-indent: fix installation 2015-01-14 10:22:35 +01:00
Benjamin Saunders 0351b7a710 Add tup
Closes #5720
2015-01-14 01:37:44 -05:00
Charles Strahan bab648c5b4 chruby: update to 0.3.9 2015-01-13 21:58:25 -05:00
Charles Strahan 3b524fe6c4 watchman: update to 3.0.0 2015-01-13 21:48:44 -05:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
lethalman 01cf6fa04d Merge pull request #5722 from nckx/coan
coan: don't double-gzip man page
2015-01-13 14:14:07 +01:00
lethalman 19d6d436dc Merge pull request #5699 from pmahoney/fswatch
Fswatch
2015-01-13 14:12:43 +01:00
Tobias Geerinckx-Rice 9b7a58e1f9 coan: don't double-gzip man page
`make install` gzips coan.1 with the wrong extension (.1). So Nix re-
compresses it. Result: coan.1.1.gz, and a screen full of gobbledygook.
2015-01-12 21:38:31 +01:00
Jaka Hudoklin b093220c5d Merge pull request #5724 from benmos/grafana-1.9.1
Upgrading Grafana 1.8.0-rc1 -> 1.9.1
2015-01-12 11:06:56 +01:00
Ben Moseley 80ab18f269 Upgrading Grafana 1.8.0-rc1 -> 1.9.1 2015-01-12 09:20:54 +00:00
Arseniy Seroka 88683589b4 Merge pull request #5706 from nckx/coan
Add coan: the C preprocessor chainsaw
2015-01-11 20:42:45 +03:00
Arseniy Seroka 01f5b79524 Merge pull request #5681 from Ericson2314/master
Remove `rust=rustc` alias,update racer
2015-01-11 20:41:58 +03:00
John Ericson 81bc099d48 Remove rust=rustc alias
I was asked to add this for backwards comparability when I renamed `rust`
to `rustc` and added `rustcMaster`. It has been a few months so I'd hope
deprecating this is acceptable.
2015-01-11 17:33:58 +00:00
Tobias Geerinckx-Rice 03e53af0f5 Add coan: the C preprocessor chainsaw 2015-01-11 15:21:26 +01:00
Domen Kožar 44912c2ac1 Merge pull request #5598 from brendanlong/go-1.4
go: Update to 1.4
2015-01-11 07:46:58 +01:00
Patrick Mahoney 41ca36e30c fswatch: new derivation 2015-01-10 15:10:16 -06:00
Moritz Ulrich 7aca9db47d dfu-programmer: Update to 0.7.1. 2015-01-10 14:41:11 +01:00
Moritz Ulrich 85dc90565f leiningen: Update to 2.5.1. 2015-01-10 14:38:45 +01:00
Georges Dubus 4067b5bff4 racer: fixed version 2015-01-10 14:25:54 +01:00
Georges Dubus 74f15178b1 racer: updated to last git master 2015-01-09 14:16:04 +01:00
Peter Simons 615787e6da haskell-cabal2nix: update to version 1.73 2015-01-08 20:17:04 +01:00
Georges Dubus a9dc59992d Merge pull request #5636 from Ericson2314/master
Misc cleanups of rustc and cargo packaging
2015-01-08 13:17:07 +01:00
Austin Seipp ec61a9ea5a nixpkgs: coccinelle 1.0.0-rc15 -> 1.0.0-rc23, and adopt
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-08 04:16:14 -06:00
John Ericson 8d96df76b9 cargo: common.nix now only contains version-agnostic bits 2015-01-08 08:38:20 +00:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Peter Simons c827471185 ihaskell-wrapper: adapt so that it evaluates with the new Haskell infrastructure 2015-01-07 22:21:23 +01:00
Ricardo M. Correia 9ad3f0ed7e cargoSnapshot: Update from 2014-12-21 -> 2014-12-30 2015-01-07 05:50:17 +01:00
Brendan Long 8c3399f4d8 go: Update to 1.4 2015-01-06 13:31:02 -06:00
John Wiegley fd26805059 sqsh: remove trailing whitespace in the Nix file 2015-01-06 09:56:08 -05:00
John Wiegley 19956bd328 ccache: remove assertion that allows building only on Linux 2015-01-06 09:56:07 -05:00
Peter Simons 8d1167f02a haskell-liquid-fixpoint: re-generate with cabal2nix 2015-01-04 20:56:50 +01:00
Peter Simons 34ed92c995 liquidhaskell: re-generate with cabal2nix 2015-01-03 00:24:48 +01:00
John Wiegley f742da0a31 liquidhaskell: new expression 2015-01-02 15:29:01 -06:00
Peter Simons ac55bb22be gnumake: add version 4.1 2015-01-01 20:36:58 +01:00
Bjørn Forsman e4dd2dcad4 libsigrok: install missing firmware files
Without this, hardware that requires firmware (e.g. Saleae Logic) is
unuseable.

Example error that this fixes:

  sr: ezusb: Unable to open firmware file /nix/store/rqgppsz3gwy8jailflf3049fzyzrgkdb-libsigrok-0.3.0/share/sigrok-firmware/fx2lafw-saleae-logic.fw for reading: No such file or directory
  sr: fx2lafw: Firmware upload failed for device 0.
2015-01-01 20:04:49 +01:00