3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

692 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Peter Simons bff4b06640 youtube-dl: enable builds by Hydra on Linux and Darwin
youtube-dl is a very short script, but it depends on Pandoc to generate its
documentation, and Pandoc is fairly expensive to build (or download). Offering
binary packages of youtube-dl for Hydra users should remedy the need to install
Pandoc.
2013-01-26 11:59:49 +01:00
Karn Kallio 90909ea936 system-config-printer patch
The latest version of system-config-printer seems to have introduced a
dependency on pycurl.  The attached patch includes this, fixing the build of
kde, which depended on it through kdeadmin.
2013-01-24 23:03:39 -05:00
Eelco Dolstra 0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra eeda226b02 Merge branch 'master' into systemd 2013-01-15 12:11:07 +01:00
Eelco Dolstra 7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Mathijs Kwik 0890c45498 buildNativeInputs -> nativeBuildInputs 2013-01-13 11:33:45 +01:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Rickard Nilsson db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd
Conflicts:
	pkgs/tools/networking/network-manager/default.nix
2013-01-03 13:44:47 +01:00
Lluís Batlle i Rossell 472499ccd8 coreutils: I forgot a file in the prev commit 2013-01-02 20:04:08 +01:00
Lluís Batlle i Rossell 09d12cc9db coreutils: update to 8.20. They didn't build in i686 here.
Here is the error:
set-mode-acl.c: In function 'qset_acl':
set-mode-acl.c:72:6: error: #error Must have acl_delete_def_file (see POSIX 1003.1e draft 17).
2013-01-02 19:26:11 +01:00
Mathijs Kwik 6c062cd5a1 youtube-dl: "link" to python directly 2013-01-01 13:50:14 +01:00
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Peter Simons 60cb018d80 youtube-dl: update to version 2012.12.11
The new build comes with man page and bash completion installed.
2012-12-27 20:46:28 +01:00
Eelco Dolstra 0ecd1f62c7 Revert "coreutils: Update to 8.20"
This reverts commit 1620307488.

8.20 doesn't build on x86_64-darwin.

http://hydra.nixos.org/build/3435174
2012-12-12 17:00:32 +01:00
Eelco Dolstra 8beea55869 system-config-printer: Update to 1.3.12
Fixes building against systemd.

http://hydra.nixos.org/build/3469842
2012-12-12 16:34:38 +01:00
Eelco Dolstra 5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Michael Raskin df44d8cbeb Update gnokii 2012-12-04 10:20:42 +04:00
Alexander Foremny 0a550a5354 Update plowshare to plowshare4-git20121126.e7e4480
plowshare now comes in two flavours, plowshare4 and plowshare3.
plowshare4 is recommonded if one can afford its larger (bash >= 4.1)
dependencies which we can. plowshare3 (bash >= 3, busybox) is aimed at
embedded devices.
2012-11-30 12:45:19 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Eelco Dolstra f04aa4fb59 Remove findutils 4.2.27
We only used this version on Darwin, but the regular findutils seems
to build fine.
2012-11-29 12:02:07 +01:00
Eelco Dolstra 1620307488 coreutils: Update to 8.20 2012-11-23 17:29:06 +01:00
Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Peter Simons 3fafdb362b bison: update to version 2.6.5
This update fixes the grub-2.0 warning issue that was worked around in commit
4f5e655b36. Consequently, that patch is no longer
needed.
2012-11-09 18:00:49 +01:00
Eelco Dolstra 8165e2ddb0 Document that Java packages should install JARs in $out/lib/java 2012-11-08 16:31:08 +01:00
Rickard Nilsson 43c9c791e0 file: Add extra source URL 2012-11-06 11:23:48 +01:00
aszlig 993601a7c5
screen: Enable PAM support by default.
I hope noone is unhappy with enabling PAM bu default. Whover doesn't want PAM to
take care of authentication can still use the "password" configuration
directive.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-05 09:45:03 +01:00
Peter Simons 4f5e655b36 grub-2.0x: avoid pragma warnings triggered by bison-2.6.4-generated parsers 2012-10-24 17:26:55 +02:00
Peter Simons 347b5800b2 grub-2.0: strip trailing whitespace 2012-10-16 19:10:16 +02:00
Peter Simons 06bdd77d3d grub-2.0: fix bash completion script 2012-10-16 19:10:11 +02:00
Lluís Batlle i Rossell 84c18a97e4 testdisk: updating to 6.13
I fixed the licence field to GPLv2+ too
2012-10-12 15:43:26 +02:00
Joachim Schiele 74196058ee added gsmartcontrol 0.8.7 to nixpkgs 2012-10-12 00:45:42 +00:00
Michael Raskin 0bf1789b6a Use newly-added taskwarrior as an update to existing taskwarrior attribute 2012-10-11 10:50:53 +04:00
Marc Weber 7b40d67d61 adding taskwarrior 2012-10-11 06:12:23 +02:00
Alexander Foremny 29d3112ee9 Rename plowshare-git to plowshare 2012-10-09 14:02:23 -04:00
Michael Raskin 18c0bca167 Fix some of the debian-devscripts shell references 2012-10-09 11:02:06 +04:00
Shea Levy 2f8ab5e651 Merge branch 'refind' into upstream 2012-10-07 17:54:30 -04:00
Shea Levy 026dd8b6f2 rEFInd: 0.4.5 2012-10-07 16:54:02 -04:00
Michael Raskin 4454e45955 Adding meta.maintainers 2012-10-07 19:21:35 +04:00
Michael Raskin 749cc2bf1e Adding Debian devscripts. Mostly for uscan.
I plan to later use uscan for simplifying package updates in some
NixPkgs packages. I have no code for that now.

I added Perl packages File::DesktopEntry and File::BaseDir in a slightly
hascky way because one part of the installation system replaced PREFIX=
with --prefix= and the other complained that it doesn't know what to do
with --prefix=. I checked that a script using File::DesktopEntry works,
and I don't know enough Perl to rewrite buildPerlPackage and hope that
my change is an improvement.

I removed trnaslated manpages because it uses po4a which has some more
Debian-specific dependencies of its own.
2012-10-07 18:02:46 +04:00
Michael Raskin d26ac88caf Merging pull request 121 from MarcWeber: update/fix debootstrap with minor fixes 2012-10-05 12:26:13 +04:00
Michael Raskin dad7ea5a7e Fix timidity source url 2012-10-02 11:23:43 +04:00
aszlig cbaf071944
youtube-dl: Update to version 2012.09.27.
As the current version doesn't work anymore and there has been a lot of progress
since February, I think it's time to switch over to the new versen.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:41 +02:00
Peter Simons 0cd82f1d17 Merge pull request #131 from aforemny/plowshare
Plowshare
2012-09-27 02:30:04 -07:00
Lluís Batlle i Rossell ad0b63265c picocom: adding picocom, 1.7 2012-09-25 19:23:34 +02:00
Alexander Foremny 1329ae018d Bump plowshare version to git20120916 2012-09-25 17:44:57 +02:00
Eelco Dolstra f29762d5d6 idutils: Fix gets() problem
http://hydra.nixos.org/build/3060033
2012-09-24 17:43:47 -04:00
Eelco Dolstra c4041d9c39 grub: Fix build on Glibc 2.16
http://hydra.nixos.org/build/3046836
2012-09-21 10:36:40 -04:00
Marc Weber ef9a15a5a4 fix/update debootstrap (thereby updating fakeroot)
fakeroot is used to create devices.tar.gz now (thanks to aszlig)
2012-09-19 11:48:27 +02:00
Eelco Dolstra db5c495d98 coreutils: Update to 8.19 2012-09-18 14:48:48 -04:00
aszlig e678cd2611
youtube-dl: Update to version 2012.02.27.
In addition, we're now switching to using refs/tags from git rather than commit
refs directly, which has the advantage, that we don't have to do bookkeeping
twice, where people forget to increment the version in nixpkgs.

This happened for the previous version, where `pkgver` had the value
"2011.12.08", but in rg3/youtube-dl@661a807c65 the
version actually is "2012.01.08b".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-15 08:10:35 +02:00
Peter Simons d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02:00
aszlig de5c5467a6
mmv: New package, version 1.01b from Debian.
This package as well as the patches are used from Debian, as the upstream
version is no longer maintained, plus other distributions seem to use the Debian
patched version aswell. And by looking at the patch from Debian, it seems
reasonable, because it contains a _lot_ of fixes that accrued over time.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 19:54:53 +02:00
Alexander Foremny 27127238f5 Merge remote-tracking branch 'upstream/master' into plowshare 2012-08-31 16:03:10 +02:00
Alexander Foremny c98559a6fc Remove curl from buildInputs 2012-08-31 16:02:10 +02:00
Alexander Foremny addbf658e5 Add maintainer 2012-08-31 16:01:19 +02:00
Alexander Foremny a23f6dc4c4 Add quotes to wrapProgram's arguments 2012-08-30 14:27:03 +02:00
Alexander Foremny 50400e345c Give correct PATH to wrapProgram 2012-08-30 14:07:47 +02:00
Alexander Foremny aed5c36694 Use makeWrapper 2012-08-29 15:16:03 +02:00
Yury G. Kudryashov bee287597a Fix gnokii URL 2012-08-26 22:08:41 +04:00
Alexander Foremny 172e6f5e77 Merge remote-tracking branch 'upstream/master' into plowshare 2012-08-26 14:46:43 +02:00
Alexander Foremny c89a0d6c4f Add package: plowshare-git20120807 2012-08-26 14:43:25 +02:00
Mathijs Kwik e5cc68e8d5 add lockfile-progs-0.1.16 2012-08-25 11:20:09 +02:00
aszlig ec6926bf7e ncdu: New package, starting at version 1.8.
`ncdu` is a little ncurses tool to browse the filesystem tree sorted by disk
usage.
2012-08-22 10:02:19 +02:00
Mathijs Kwik 00fa89e41f pv: upgrade to 1.3.4 2012-08-21 12:38:44 +02:00
Shea Levy 1b2acb25e6 xclip: Bump 2012-08-20 16:36:10 -04:00
Eelco Dolstra acdd81fb9c Add some packages to the channel 2012-08-17 09:53:55 -04:00
Rob Vermaas 374886444f xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE 2012-08-07 03:27:00 +02:00
Rob Vermaas f676f9e487 Add xvfb-run, a wrapper script for Xvfb. 2012-08-07 03:14:17 +02:00
Eelco Dolstra f4847262ae grub2: Add dependency on devicemapper (needed for LVM support) 2012-08-01 21:30:47 +02:00
Eelco Dolstra 6262db94a9 grub: Update to 2.00 2012-07-24 22:33:39 -04:00
Shea Levy 8253542544 Add logstash
For now just download the pre-built jar. We may build our own later.
2012-07-11 07:23:14 -04:00
Shea Levy 015e7594d0 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2012-07-02 11:27:25 -04:00
Ludovic Courtès 77fdc7bb35 GNU Coreutils: Allow builds with newer versions of glibc. 2012-06-28 15:30:02 +02:00
Shea Levy 8cc0edaeba Merge branch 'master' into stdenv-updates
ssp is disabled for glibc-2.13 unconditionally
2012-06-27 13:48:22 -04:00
Eelco Dolstra e0b38f88db * Fortune: use a "-" instead of a "_" to separate the package name
from the version.  Otherwise "nix-env -i fortune-mod" doesn't work.
  (Reported on IRC.)

svn path=/nixpkgs/trunk/; revision=34487
2012-06-12 23:41:05 +00:00
Peter Simons 5375a3edf6 Fix installation of figlet 2.2.4.
svn path=/nixpkgs/trunk/; revision=34440
2012-06-11 07:15:10 +00:00
Peter Simons befd7e0ee8 Update figlet to version 2.2.4.
This is primarily because version 222 is no longer available at the upstream FTP
site.

svn path=/nixpkgs/trunk/; revision=34439
2012-06-11 07:15:06 +00:00
Shea Levy 3119e4983d pv: Update source url
svn path=/nixpkgs/trunk/; revision=34425
2012-06-10 18:01:37 +00:00
Lluís Batlle i Rossell 0f6b8dbd52 Updating pv to 1.3.1
svn path=/nixpkgs/trunk/; revision=34415
2012-06-10 10:47:16 +00:00
Lluís Batlle i Rossell 781666f649 Updating ethtool (we had a 5-year-old ethtool)
svn path=/nixpkgs/trunk/; revision=34305
2012-05-31 16:03:49 +00:00
Eelco Dolstra 76431dad65 * Make file 5.11 the default.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34114
2012-05-15 16:34:07 +00:00
Rob Vermaas 97cac0a58c Added i3wm. Added newer version of file. (this time tested, I screwed up a patch by garbas)
svn path=/nixpkgs/trunk/; revision=33952
2012-04-30 14:34:57 +00:00
Rob Vermaas 0823167b43 Revert my previous 2 commits.
svn path=/nixpkgs/trunk/; revision=33951
2012-04-30 14:28:08 +00:00
Rob Vermaas 0362f55a22 add missing files from previous commit
svn path=/nixpkgs/trunk/; revision=33950
2012-04-30 13:45:50 +00:00
Michael Raskin 02ff38f7b1 Patch unused variable errors
svn path=/nixpkgs/trunk/; revision=33768
2012-04-12 21:28:45 +00:00
Michael Raskin 25ef476ba0 Fix ttf2pt1 build
svn path=/nixpkgs/trunk/; revision=33755
2012-04-12 07:55:49 +00:00
Ludovic Courtès eabcd9d210 GNU Parted 3.1.
svn path=/nixpkgs/trunk/; revision=33703
2012-04-09 20:51:27 +00:00
Ludovic Courtès b65bcf445c GNU idutils 4.6.
svn path=/nixpkgs/trunk/; revision=33700
2012-04-09 20:51:13 +00:00
Ludovic Courtès 369fe599b1 GNU Parallel 20120322.
svn path=/nixpkgs/trunk/; revision=33696
2012-04-09 20:50:54 +00:00
Lluís Batlle i Rossell 0684ca8745 Adding the memtest86 from memtest86.com, and renaming the top-level attribute
name of memtest86+ to memtest86plus.

I think it makes more sense for the attribute memtest86 to point to the
upstream memtest86.com version.


svn path=/nixpkgs/trunk/; revision=33689
2012-04-09 19:54:34 +00:00
Shea Levy 742894471d Add rEFInd
svn path=/nixpkgs/trunk/; revision=33474
2012-03-29 14:54:17 +00:00
Rob Vermaas 076946d277 add fortune
svn path=/nixpkgs/trunk/; revision=33462
2012-03-29 07:15:40 +00:00
Eelco Dolstra a0f057e805 * Updated jdiskreport.
svn path=/nixpkgs/trunk/; revision=33440
2012-03-27 11:31:25 +00:00
Yury G. Kudryashov 0d90c06ba1 Remove some packages with Qt3 dependency
kde3.k3b: use kde4.k3b instead
kde3.kphone: there are many other SIP phones
valknut: last version from 2009, doesn't support new ADC protocol
qdu: latest release in 2004, use kde4.filelight

REVIEWBOARD:5

svn path=/nixpkgs/trunk/; revision=33273
2012-03-19 18:31:02 +00:00
Shea Levy d30947aef3 Move NixosBootPkg into NixOS
svn path=/nixpkgs/trunk/; revision=33149
2012-03-16 11:53:50 +00:00
Shea Levy b3e248d0f7 Whoops, sloppy copy
svn path=/nixpkgs/trunk/; revision=33136
2012-03-16 02:41:12 +00:00