1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

163 commits

Author SHA1 Message Date
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát cb639302df Merge glibc-2.18 branch into stdenv-updates
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Eelco Dolstra 9f75797d0b Merge remote-tracking branch 'origin/glibc-2.18' 2013-12-26 14:49:19 +01:00
Mathijs Kwik 7ad65e860e netatalk: depend on db4 instead of db48, now the db4 default became db48 2013-12-23 11:10:18 +01:00
Nixpkgs Monitor 14d3f044b4 netatalk: update from 3.0.5 to 3.1.0 2013-12-21 04:02:37 +02:00
Nixpkgs Monitor 9f152ede35 archivemount: update from 0.6.1 to 0.8.3 2013-12-18 18:18:16 +02:00
Eelco Dolstra 134ba27ea2 Merge remote-tracking branch 'origin/master' into glibc-2.18 2013-12-18 15:42:54 +01:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor a2a1eb88cb httpfs2: update from 0.1.4 to 0.1.5 2013-12-16 01:36:16 +02:00
Nixpkgs Monitor 75bef13fca xfsprogs: update from 3.1.8 to 3.1.11 2013-12-14 00:46:44 +02:00
Eelco Dolstra ec5739ef17 jfsrec: Fix build
http://hydra.nixos.org/build/7008843
2013-12-10 14:28:19 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Evgeny Egorochkin 328d59eab6 add meta.repositories.git to several packages 2013-12-10 01:07:30 +02:00
Nixpkgs Monitor 8f4b7e2133 dosfstools: update from 3.0.21 to 3.0.24 2013-12-09 12:13:11 +02:00
Sergey Mironov 82fefa0de8 yandex-disk: fix bash-completion, add long description
bashCompletion created 'have1' file in the current directory occasionally. this
patch fixes it.
2013-12-05 14:42:16 +04:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Sergey Mironov 1fa1dd24ad yandex-disk: add the Yandex.Disk cloud storage client
Details:
http://help.yandex.com/disk/cli-clients.xml
2013-11-18 14:31:50 +04:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
William A. Kennington III 59de62317d btrfs: fix build to link against libgcc_s so that pthread_cancel is linked
Currently, the command btrfs scrub start <filesystem> attempts to invoke the pthread_cancel
routine and ends with an error melibgcc_sssage about it being missing. This prevents btrfs
scrub status from maintaining proper statistics about the running scrub.

Close #1127.
2013-10-27 20:21:22 +02:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
James Cook d43d1aa0d0 e2fsprogs: Update to 1.42.8. 2013-10-21 11:42:37 +02:00
Michael Raskin e38f86a887 Updating GlusterFS to 3.4.1 2013-10-20 21:10:25 +04:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Eelco Dolstra 2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Bjørn Forsman 28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Jack Cummings 122b19c429 netatalk-3.0.5 2013-09-15 22:54:57 -07:00
Peter Simons 3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Sergey Mironov fe6b021ee1 fuse-exfat: add FUSE-mounter for exFAT devices 2013-09-07 01:25:30 +04:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Mathijs Kwik 31648f889d btrfsprogs: upgrade to current git master 2013-08-10 13:53:17 +02:00
aszlig 1362d479cb
nixpart: Update to bugfix version 0.4.1.
Contains the following fix:

  - Fix mounting btrfs when mount_only (-m) is used.

I would like to update blivet as well, but at the moment it breaks for
nixpart, so let's retry later when we're at 0.5.x or even 1.x :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-02 07:36:08 +02:00
Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Peter Simons 7f9e83f8cc dosfstools: update to version 3.0.21 2013-07-18 21:38:06 +02:00
Evgeny Egorochkin cea107c07f More mirror:// URL fixes 2013-07-14 03:31:12 +03:00
Evgeny Egorochkin d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Vladimír Čunát dafb31a8e1 Revert "e2fsprogs: Fix manpages", no more need for this
This reverts commit 7f4e473832.
See #523 and #529.
2013-07-13 16:22:44 +02:00
aszlig b47e2c2ab6
nixpart: New upstream version 0.4.0.
Changes are:

 - Properly detect GPT disklabels and create proper BIOS boot partitions
   if necessary.
 - Return exit code 100 if reboot is required due to the kernel not
   picking up the new partition table.
 - Don't include BIOS boot partition in GRUB devices.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-12 18:41:11 +02:00
aszlig f75f7e793b
nixpart: New upstream version 0.3.0.
This fixes two issues:

 - Don't _always_ print out NixOS configuration, only when explicitly
   requested with -p.
 - Add GRUB boot devices to NixOS configuration output.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-11 16:05:59 +02:00
Domen Kozar d7d873fb95 add extundelete 2013-07-08 21:08:40 +02:00
aszlig 6fcc6816e7
nixpart: Update to new version 0.2.1.
This is a minor bugfix release and only corrects "type" in fileSystems output to
"fsType".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-08 14:27:44 +02:00
aszlig b2311fbf3a
python-nixpart: Propagate overrides of blivet.
This allows for easy overriding of blivets udev dependency using only
nixpart.override.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-08 14:27:43 +02:00
aszlig 513de0ff57
python-nixpart: Move into tools/filesystems/.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-08 14:27:42 +02:00
Eelco Dolstra acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Rob Vermaas ccda14879e Add unionfs-fuse and ntfs-3g to the channel 2013-06-15 20:47:47 +02:00
Evgeny Egorochkin dc54358ce9 Change package versions to conform to nixpkgs conventions. 2013-06-09 05:41:44 +03:00
Eelco Dolstra 7f4e473832 e2fsprogs: Fix manpages
See issue #523.
2013-05-11 18:18:40 +02:00