jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,748 Commits 266 Branches 122 Tags 5.3 GiB
b671a46f92
Commit Graph

365 Commits

Author SHA1 Message Date
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Siarhei Zirukin
60f2081019 plan9port: make it actually work 
* Add "which" dependency, otherwise it builds with lots of
  "command not found" errors.

* -lgcc_s, otherwise many commands basically fail without pthread_cancel.

* Fix X11 dependencies, otherwise it would be plan9port with none of UI
  programs working.
 2014-12-06 16:18:30 +01:00
Peter Simons
79486d44c0 tree: don't rely on $CC being set in the stdenv build environment 
Fixes https://github.com/NixOS/nixpkgs/issues/5214.
 2014-12-03 16:00:41 +01:00
Vladimír Čunát
06c6d4696d *: fix builds by disregarding warning from new glibc 
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.

In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
 2014-11-28 18:42:03 +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
18ffe551e8 acct: update from 6.6.1 to 6.6.2 and adopt it 2014-11-14 12:15:26 +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
Vladimír Čunát
28abe40149 pciutils: update, extend meta, maintain 2014-11-10 20:17:35 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Jaka Hudoklin
cc3ba83055 Add augeas, configuration editing tool 2014-11-09 14:32:08 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Mateusz Kowalczyk
6c7793713d lshw: fix location of the binary 
The binary was going into sbin so even with package in profile we still
couldn't use it.

cc @phreedom
 2014-11-08 03:10:26 +00:00
Rickard Nilsson
3b6953abdf Up syslog-ng-incubator to work with syslog-ng 3.6 
Also disable riemann extension, since it is now part of 3.6.
 2014-11-06 21:59:04 +01:00
Rickard Nilsson
71f64ded06 Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1"" 
This reverts commit 8e1072fd60f9dcf5eac0bb2d604258f121b658d8.
 2014-11-06 21:59:04 +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
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

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
Michael Raskin
895debb20f Update IPMIutil 2014-11-05 10:46:26 +03: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
Peter Simons
b5fed52c43 Merge pull request #4238 from wkennington/master.boost 
Make boost 156 the default
 2014-11-03 23:03:01 +01:00
Michael Raskin
4fd8e1eac0 Update ioping 2014-11-04 00:37:42 +03:00
Michael Raskin
04635a87eb Update monit 2014-11-03 16:54:38 +03:00
William A. Kennington III
79cc2754ca syslog-ng-incubator: Refactor 2014-11-02 17:22:28 -08:00
William A. Kennington III
8e1072fd60 Revert "syslog-ng: Update from 3.5.6 to 3.6.1" 
This reverts commit e2ada42623f26d51cf7d1253ac0700297e1a9b83.
 2014-11-02 17:22:28 -08:00
Michael Raskin
b6c0e1825b Update FreeIPMI 2014-11-02 23:51:58 +03:00
Rickard Nilsson
e2ada42623 syslog-ng: Update from 3.5.6 to 3.6.1 
Also update the NixOS module, syslog-ng now automatically listens to
the systemd journal, so we don't have to set up syslog.socket.
 2014-10-27 12:22:22 +01:00
Evgeny Egorochkin
7a01610988 logcheck: update from 1.3.16 to 1.3.17 2014-10-27 07:16:33 +02:00
koral
03ec2d9477 New package: safe-rm-0.11 2014-10-21 20:19:57 +02:00
Rickard Nilsson
6960149b03 New package: runit 2.1.2 2014-10-15 13:08:22 +02:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Aristid Breitkreuz
c7a06fa51a Merge pull request #4412 from wavewave/proot 
proot: remove self.stdenv.lib
 2014-10-09 20:50:12 +02:00
Aristid Breitkreuz
352c310be9 ansible: update from 1.7.1 to 1.7.2 2014-10-09 20:14:38 +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
Aristid Breitkreuz
bcc8e42627 ipmitool: update from 1.8.13 to 1.8.14 2014-10-07 21:50:40 +02:00
Aristid Breitkreuz
78da0ea8d6 smartmontools: update from 6.2 to 6.3 2014-10-07 21:08:46 +02:00
Ian-Woo Kim
6d724303c3 Merge remote-tracking branch 'nixos/master' into proot 
Conflicts:
	pkgs/tools/system/proot/default.nix
 2014-10-07 16:16:00 +02:00
Ian-Woo Kim
526b4d9f79 proot: remove self.stdenv.lib 2014-10-07 14:23:42 +02:00
Luca Bruno
e229cfb57c Revert "Merge pull request #4406 from wavewave/proot" 
This reverts commit 552d1ec8b36515c3de5d660815a521353419bae6, reversing
changes made to 3432414808afa5bdb2019f165365f5b6ff46cf2f.
 2014-10-07 14:05:31 +02:00
lethalman
552d1ec8b3 Merge pull request #4406 from wavewave/proot 
proot: User-space implementation of chroot, mount --bind and binfmt_misc
 2014-10-07 12:10:39 +02:00
Ian-Woo Kim
6a0396ce01 proot: remove unnecessary phases 2014-10-07 11:54:12 +02:00
Ian-Woo Kim
609bea973a proot: User-space implementation of chroot, mount --bind and binfmt_misc 2014-10-07 02:37:23 +02:00
Aristid Breitkreuz
7ea4b4e981 ddrescue: update from 1.18.1 to 1.19 2014-10-06 21:58:40 +02:00
Aristid Breitkreuz
68985618c2 at: update from 3.1.15 to 3.1.16 2014-10-06 21:47:34 +02:00
Michael Raskin
170a5bfe58 Merge pull request #4207 from joefiorini/patch-1 
Allow ansible to install on darwin platforms
 2014-10-02 23:22:27 +04:00
Michael Raskin
86772c4e79 Update ipmiutil 2014-09-24 13:45:57 +04:00
Joe Fiorini
c9a49a6725 Update to latest ansible version 2014-09-23 09:24:11 -04:00
Joe Fiorini
e47b778109 Allow ansible to install on darwin platforms 
I am using this package on my Yosemite install of OS X and it works great. It also pretty closely follows the Homebrew recipe that most OS X users use, so I think we can open it up to other OS X users.
 2014-09-23 09:24:11 -04: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
Joachim Schiele
5b17ce8675 Merge pull request #4149 from qknight/dog 
dog-1.7: added potential cat replacement
 2014-09-18 18:08:55 +02:00