mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues Wiki Activity
53103 commits 233 branches 124 tags 7 GiB
Commit graph

1151 commits

Author SHA1 Message Date
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 f6b8460aa4 youtube-dl: update from 2014.11.04 to 2014.11.12 2014-11-12 16:11:07 +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 ea49ac0496 flashrom: fix 4936 2014-11-11 21:53:37 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Pascal Wittmann fa9af37751 kermit: update from 8.0.211 to 9.0.302 2014-11-09 17:26:37 +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
宋文武 33d1a9a3cf ostree: new package 2014-11-07 13:30:04 +08: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 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
AndersonTorres 56e9b2c953 Youtube-dl: upgrade to 2014.11.04 2014-11-05 06:01:24 -02: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
Vladimír Čunát ed867a50eb iconv: remove usage on Linux in several packages 
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
 2014-11-03 12:58:54 +01:00
Evgeny Egorochkin 3a03bf5700 youtube-dl: update from 2014.10.30 to 2014.11.02.1 2014-11-03 13:18:20 +02:00
Michael Raskin 4ef5bd9918 Update Pipelight: both Wine version and Pipelight distribution 2014-11-02 23:51:58 +03:00
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Evgeny Egorochkin 767814e585 youtube-dl: update from 2014.10.25 to 2014.10.30 2014-11-01 14:52:11 +02:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
William A. Kennington III fa6275857e yubico-piv-tool: Add derivation 2014-10-29 02:05:17 -07:00
Pascal Wittmann e7bfcdac05 parallel: update from 20140922 to 20141022 2014-10-28 15:51:47 +01:00
Evgeny Egorochkin 7eb9b172bb youtube-dl: update from 2014.10.13 to 2014.10.25 2014-10-27 07:35:13 +02:00
Anders Papitto 0d11520727 add rcm, Management Suite for Dotfiles 2014-10-26 00:17:26 +02:00
Evgeny Egorochkin 8977addc3a youtubeDL: update from 2014.09.19 to 2014.10.13 2014-10-25 20:31:54 +03:00
William A. Kennington III ce590c3fc7 yubikey-personalization-gui: Add derivation 2014-10-24 16:37:37 -07:00
William A. Kennington III 2910183d5e yubikey-personalization: Add derivation 2014-10-24 16:37:37 -07:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Vladimír Čunát 2cf17b0802 Merge recent master into staging 
Hydra nixpkgs: ?compare=1156478
 2014-10-23 17:40:41 +02:00
Mateusz Kowalczyk adb034f299 Merge pull request #4522 from ts468/trustedGrub 
Add package: trustedGrub
 2014-10-23 11:47:05 +01:00
Valérian Galliat 1f4456fb5a Add youtube-dl license 2014-10-22 20:35:42 +02:00
aszlig 78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir. 
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:59 +02:00
aszlig 7676ff5973
nixpart: Bring back requirements for version 0.4. 
Quite a mess but at least the mdraid tests succeed now. However, the
lvm2 tests are still failing, so we need to bring back a few more old
crap :-(

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:58 +02:00
aszlig 34ae3b7f77
parted: Update to new upstream version 3.2. 
In order to properly run tests, we need to fix the unicode tests and
after some search, I have found that Ludo (who is also the <nixpkgs>
maintainer of parted) already reported this upstream and also provided a
solution:

http://lists.gnu.org/archive/html/bug-parted/2014-08/msg00003.html

I'm updating parted to 3.2, because the latest blivet implementation
relies on it for device geometry calculations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 01:54:47 +02:00
Michael Raskin 6b727e8d68 Merge pull request #4596 from abbradar/rpmextract 
Add "rpmextract" script and use it
 2014-10-20 22:00:59 +04:00
Nikolay Amiantov 307af9148b use rpmextract in some packages 2014-10-20 03:16:59 +04:00
Michael Raskin a95a5ef29f Fix override for patched Wine in pipelight 2014-10-18 19:52:59 +04:00
koral 43292d1ebf Removed useless terminfo wrapping. 
Users should manually set the TERMINFO environment variable.
 2014-10-18 16:04:34 +02:00
Michael Raskin 6909944827 Remove failing steps from pipelight build 2014-10-18 00:14:51 +04:00
Michael Raskin eee6f5a004 Adding Pipelight via patch from Sven Keidel and some cleanup 2014-10-18 00:14:51 +04: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
Thomas Strobel 596c9f54dc Add trustedGrub package. 2014-10-14 16:02:48 +02:00
Jaka Hudoklin dd0758ab6b Merge pull request #4392 from cstrahan/logstash 
logstash service improvements
 2014-10-12 23:02:52 +02:00
Peter Simons 1658c545d4 Merge pull request #4502 from grwlf/screen-256color 
screen: enable 256 colors
 2014-10-12 21:45:58 +02:00
Sergey Mironov efcb363ea9 screen: enable 256 colors 2014-10-12 20:47:47 +04:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Domen Kožar 482779e582 python: get rid of ssl module as it's always builtin 2014-10-11 20:23:51 +02:00
Domen Kožar 576a5605b8 ised: get rid of builderDefsPackage 2014-10-11 18:28:29 +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 d647adf85a less: update from 468 to 470 2014-10-08 20:23:27 +02:00