1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 10:31:36 +00:00
Commit graph

215 commits

Author SHA1 Message Date
William A. Kennington III 88e4596ffd Fix btrfsprogs so nix detects the version
Currently, btrfsprogs is misdetected by nix such that it requires
specifying btrfs-progs-v3.12 for install instead of just btrfs-progs.
This patch removes the v so that it now reads btrfs-progs-3.12 and is
properly detected by nix.
2013-12-29 06:55:47 -06:00
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
William A. Kennington III 0276de4d1b Updated btrfsprogs from 0.20-git -> 3.12
Additionally, removed an unmaintained utility for setting the uuid of
sent volumes.
2013-12-28 19:23:10 -06: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
Eelco Dolstra 534c5c5d9c e2fsprogs: Update to 1.42.7 2013-05-11 18:09:05 +02:00
Mathijs Kwik 7761952d06 btrfsprogs: upgrade to latest git
this incorporates all patches we already used and makes btrfs-send
work with kernel 3.9+
2013-05-11 15:27:54 +02:00
Eelco Dolstra 4d5ba15ea9 openssh: Update to 6.2p1 2013-04-12 15:27:13 +02:00
Rickard Nilsson 7870db8b10 unionfs: Add mount helper (mount.unionfs-fuse)
This makes it possible to mount unionfs directly with mount or fstab.

Example fstab entry:

  none /mnt/union unionf-fuse allow-other,dirs=/source1=RW,/source2=RW

Note, the dirs= option need to be the last option, due to limitations
in the mount helper provided by unionfs-fuse. Maybe we should write a
better helper ourselves.

Also, you need to specify your branches as dirs= option, NOT as
the device, since the latest version of libmount always interprets
"=" characters in the device name as a tag (like LABEL, UUID etc)
and will try to resolve the tag before calling the mount helper.
This will of course not succeed and the mount will fail.
2013-04-09 16:36:38 +02:00
Vladimír Čunát e218c79b85 grive: fix build with new binutils headers 2013-03-09 12:27:38 +01:00
Vladimír Čunát c0f6910758 fuse_zip: fix with new libzip 2013-02-28 15:43:06 +01:00
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Peter Simons 0d7f427620 davfs2: read config files from /etc/davfs2 instead of ${out}/etc/davfs2
This patch makes the 'noDavsUser' argument to the build expression obsolete.
2013-02-21 12:03:52 +01:00
Eelco Dolstra dbedbdc939 types.h -> types.patch 2013-01-28 17:27:14 +01:00
Eelco Dolstra 38ced3b436 jfsutils: Fix build
http://hydra.nixos.org/build/3897210
2013-01-28 17:19:01 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra 4bca4fa2b8 reiserfsprogs: Fix URL 2013-01-15 18:53:12 +01:00
Mathijs Kwik 6860ab9946 jfsutils: upgrade to 1.1.15 2013-01-13 14:30:54 +01:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Mathijs Kwik 4907102677 btrfs-progs: add small tool to set the received-uuid of exisiting subvolumes 2013-01-01 13:50:15 +01:00
Mathijs Kwik 9572c2fae8 btrfs-progs: minor patches to get "btrfs receive" working 2013-01-01 13:50:15 +01:00
Mathijs Kwik 3d0b5b7a8f btrfs-progs: small patch to fix listing subvolumes on kernel 3.6+
The btrfs cleaner, introduced in 3.6 leaves some unresolvable entries,
which the userspace utils don't know how to handle.
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
Shea Levy 6a147cfbfa Add unionfs-fuse meta 2012-12-16 16:42:45 -05:00
Shea Levy 42b061d118 Add unionfs-fuse 2012-12-16 16:25:24 -05:00
Michael Raskin 8a6b0087a9 Update GlusterFS 2012-12-04 21:54:20 +04:00
Florian Friesdorf c1c0305df8 xtreemfs-1.4
1.3.0 did not build anymore, would need to be handed the correct
version of boost.
2012-11-26 14:42:09 +01:00
Mathijs Kwik 10462c7a82 btrfsprogs: upgrade to current version (0.20 pre) 2012-10-09 16:05:24 +02:00
Rickard Nilsson 38161b6c64 dosfstools: Add alternative URL, since main site seems to be down. 2012-10-02 08:51:51 +02:00
Lluís Batlle i Rossell 029aabe7f3 mtdutils: updating, and making them build
The previous 1.3.1 wasn't properly fetched by fetchgit, somehow.
2012-09-16 22:41:32 +02:00
Mathijs Kwik 0bf2161b03 e2fsprogs: minor upgrade to 1.42.5 2012-09-05 16:14:20 +02:00
Mathijs Kwik 39760a2ad6 davfs2: upgrade to 1.4.7
- add option to disable the default user/group in the config file.
  If you only want to mount filesystems as root (don't use setuid
  root), the default is not very useful. This setting is not
  overridable from an external config file, so this needs to be done
  here. Perhaps it's possible to tell the package to look in system
  /etc, but that makes the install-phase try to put files there too.
  Would take quite some patching.
2012-09-04 17:49:32 +02:00
Mathijs Kwik 50e173755b grive: upgrade to 0.3.0 2012-07-26 20:46:33 +02:00
Eelco Dolstra 1d44578b48 Add ciopfs 2012-07-25 23:18:40 -04:00
Eelco Dolstra 7bd3cf21a5 ntfs-3g: Update to 2012.1.15 2012-07-25 23:18:40 -04:00
Eelco Dolstra b9b5a8d7c1 Fix btrfs-progs build
http://hydra.nixos.org/build/2842473
2012-07-18 09:21:33 -04:00
Mathijs Kwik b37521e297 grive: new package 2012-06-30 10:34:07 +02:00
Eelco Dolstra 99c765ff57 e2fsprogs: Update to 1.42.4 2012-06-28 11:32:59 -04:00
Lluís Batlle i Rossell 4a380e1eb1 Updating xfsprogs
svn path=/nixpkgs/trunk/; revision=34417
2012-06-10 14:41:22 +00:00
Eelco Dolstra 500c46b56b * Update AEFS.
svn path=/nixpkgs/trunk/; revision=34078
2012-05-13 00:47:58 +00:00
Eelco Dolstra 627f3574a6 * sshfs updated to 2.4.
svn path=/nixpkgs/trunk/; revision=34076
2012-05-12 23:11:00 +00:00
Eelco Dolstra 4b414f89ed * e2fsprogs updated to 1.42.2.
svn path=/nixpkgs/trunk/; revision=33846
2012-04-19 16:49:35 +00:00
Shea Levy 7f5520bfba Update btrfsProgs
svn path=/nixpkgs/trunk/; revision=33497
2012-03-31 14:51:36 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Eelco Dolstra 219b00faa2 * e2fsprogs updated to 1.42.
svn path=/nixpkgs/trunk/; revision=32293
2012-02-15 01:09:33 +00:00
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra ff1bfcaefb * Added fuse-zip, a FUSE filesystem for accessing zip files.
svn path=/nixpkgs/trunk/; revision=32143
2012-02-08 15:45:26 +00:00
Eelco Dolstra c44e954bdc * Fix the squashfs build (it links against xz, so xz has
to be in the buildInputs).  While at it, update to 
  version 4.2.  "attr" is no longer needed as a dependency.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31744
2012-01-20 17:43:50 +00:00
Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Peter Simons 7b1be8e27d btrfs-progs: small fix for Makefile
line was split so we cannot append anymore because that appends after \

svn path=/nixpkgs/trunk/; revision=31656
2012-01-18 20:32:45 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00