cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
53568 commits 1 branch 0 tags 3.7 GiB
Commit graph

994 commits

Author SHA1 Message Date
Mateusz Kowalczyk
03655c332a Add meta.branch to a bunch of packages 
Gives better results in the monitor
 2014-11-19 18:54:58 +00:00
Aristid Breitkreuz
1dfd467c14 distcc: fix evaluation (fixes #5002) 2014-11-16 13:52:28 +01:00
Vladimír Čunát
6fff0af6c3 ccache: fix evaluation 2014-11-16 09:19:35 +01:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Pascal Wittmann
3d7a2ccf55 yodl: update from 3.03.0 to 3.04.00 2014-11-14 13:05:46 +01:00
Pascal Wittmann
cb70b5a620 yodl: update from 2.14.3 to 3.03.0 2014-11-13 17:48:06 +01:00
Peter Simons
2d253c2412 haskell-ShellCheck: update to version 0.3.5 2014-11-13 14:51:38 +01:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Vincent Laporte
fa09f72162 ccache: update from 3.1.9 to 3.1.10 2014-11-06 00:32:43 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
Evgeny Egorochkin
cb981b9dad swig3: update from 3.0.0 to 3.0.2 2014-11-03 13:29:23 +02:00
Evgeny Egorochkin
3580f6dab5 automake: add meta.branch 2014-11-03 12:58:08 +02:00
koral
0670f105cc cgdb: 0.6.6 -> 0.6.7 2014-11-02 21:47:54 +01:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Charles Strahan
a8a9b93d98 chruby: allow for specifying Rubies to use 
This allows the user to specify an attrset of Rubies to use with chruby by
overriding the default of ~/.rubies with a path to a symlink tree.
 2014-10-27 03:48:30 +00:00
Charles Strahan
d696f56324 chruby package: a utlity for switching the current ruby version. 2014-10-26 04:31:35 +00:00
Vladimír Čunát
89354b4b1a autoconf-2.13: add versioned executable 
Needed by mozilla hg builds.
 2014-10-25 21:40:23 +02:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging 
Hydra nixpkgs: ?compare=1156478
 2014-10-23 17:40:41 +02:00
Domen Kožar
efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Peter Simons
1c8b3d9217 haskell-cpphs: update to version 1.18.6 2014-10-19 16:55:23 +02:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Lluís Batlle i Rossell
83fb281d80 Making hydra build ddd. 
(cherry picked from commit 4ba671ff113844267dbad307f8a5cbf8ac1d0f52)
 2014-10-15 11:16:27 +02:00
Eelco Dolstra
d4d0e449d7 Remove obsolete Hydra package 2014-10-14 22:49:12 +02:00
Rickard Nilsson
87bcb503aa kibana: Update from 3.1.0 to 3.1.1 2014-10-14 19:06:03 +02:00
Bjørn Forsman
391c2778d4 lttng: update to latest (2.4.1 -> 2.5.0) 
- This unbreaks lttng linux kernel modules[1]
- lttng-tools has grown a dependency on libxml2

[1]: Build tested (for default NixOS Linux kernel) and run tested with
lttng-sessiond (it successfully loads kernel modules).
 2014-10-13 22:16:32 +02:00
Pascal Wittmann
f0ef22b1b7 help2man: update from 1.46.3 to 1.46.4 2014-10-13 17:40:22 +02:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Pascal Wittmann
2ff0c8d6ef epm: update from 4.1 to 4.2 2014-10-08 09:17:28 +02:00
Aristid Breitkreuz
6b315040f3 intel-gpu-tools: update from 1.7 to 1.8 2014-10-07 21:50:40 +02:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
 2014-10-07 00:09:37 +02:00
Damien Cassou
5d294db3b2 shellcheck is packaged twice 
I removed development/libraries/haskell/ShellCheck and kept
development/tools/misc/ShellCheck.
 2014-10-03 20:16:25 +02:00
Mateusz Kowalczyk
7b3cef8eac babeltrace: update from 1.2.1 to 1.2.3 
cc @bjornfor
 2014-09-30 11:19:11 +01:00
Eelco Dolstra
6843fc41c9 Fix evaluation 2014-09-30 00:51:00 +02:00
ambrop7@gmail.com
e0f430cfb3 BOSSA: Try to fix a nondeterministic build failure. 
There's a Make rule to generate .cpp from .asm but the .cpp is included
in the source. Presumably the timestamps of these two files in the tmp
dir are different when Hydra is building, but not on my system. This
causes Make to try to rebuild .cpp, but the tools needed for that are missing.
 2014-09-25 22:51:50 +02:00
Pascal Wittmann
911627497a help2man: update from 1.46.2 to 1.46.3 2014-09-25 16:11:33 +02:00
Austin Seipp
84491adb48 arcanist: 20140812 -> 20140924 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-09-24 15:28:49 -05:00
Vincent Laporte
7f76d0c040 Fixes coccinelle (depends on camlp4) 2014-09-23 21:06:18 +01:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
 2014-09-23 11:27:53 +02:00
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Jaka Hudoklin
6f30a55f27 grafana: update 1.5.4 -> 1.8.0-rc1 2014-09-16 10:28:03 +02:00
Jaka Hudoklin
79a6bddc1e Add kibana, visualize logs and time-stamped data 2014-09-16 10:28:03 +02:00
Charles Strahan
ff344624d6 add go-repo-root, dependency of go2nix 2014-09-15 09:53:30 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Eric Seidel
0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv 
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
 2014-09-08 18:24:58 +02:00