JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,276 Commits 2 Branches 0 Tags 12 GiB
c951a0ad07
Commit Graph

827 Commits

Author SHA1 Message Date
Jaka Hudoklin
e10198e7f4 Merge pull request #20496 from offlinehacker/pkgs/gocryptfs/init 
gocryptfs: init at 1.1.1
 2016-12-04 22:23:09 +01:00
Jaka Hudoklin
3675631f63 convoy: init at 0.5.0 2016-11-30 23:28:18 +01:00
Eric Litak
0a77fc86b2 f3: corrected version number 2016-11-27 06:52:38 -08:00
Jörg Thalheim
03d3531fb3 Merge pull request #20724 from elitak/f3 
f3: newer git rev, build extra binaries
 2016-11-27 13:15:44 +01:00
Eric Litak
c4650769f5 f3: newer git rev, build extra binaries 2016-11-27 02:40:58 -08:00
Alexey Lebedeff
7e3176bca2 blivet: Remove unneccesary patching 
Fixes https://github.com/NixOS/nixops/issues/552

`--cache` argument is now mandatory for `pvscan` both from hetzner rescue
system and from nixpkgs.
 2016-11-24 14:13:26 +03:00
Jörg Thalheim
9338d326c2 Merge pull request #20643 from makefu/snapraid/update/11.0 
snapraid: 10.0 -> 11.0
 2016-11-24 12:00:13 +01:00
makefu
247a77ad00
snapraid: 10.0 -> 11.0 2016-11-23 10:50:58 +01:00
Franz Pletz
6f1308ba95
Revert "btrfs-progs: 4.8.2 -> 4.8.3" 
This reverts commit e82c325bff.

This package update breaks the `update-grub.pl` script:

    updating GRUB 2 menu...
    Btrfs did not return a path for the subvolume at /
    error: unable to activate new configuration

This backwards-incompatible change is the culprit:

    $ /nix/store/np25r3yzv2r41ji7v73j110inpj8lhn2-btrfs-progs-4.8.2/bin/btrfs subvol show /
    / is toplevel subvolume

vs.

    $ /nix/store/h53vs13nqvjwahpl26a4s7ygqk9xw1mw-btrfs-progs-4.8.3/bin/btrfs subvol show /
    /
    	Name: 			<FS_TREE>
    	UUID: 			-
    	Parent UUID: 		-
    	Received UUID: 		-
    	Creation time: 		-
    	Subvolume ID: 		5
    	Generation: 		6004631
    	Gen at creation: 	0
    	Parent ID: 		0
    	Top level ID: 		0
    	Flags: 			-
    	Snapshot(s):
 2016-11-17 17:47:18 +01:00
Jaka Hudoklin
9e92237ed7 gocryptfs: init at 1.1.1 2016-11-17 14:15:47 +01:00
Eelco Dolstra
ce4cf12a3b Merge pull request #20397 from obadz/e2fsprogs 
e2fsprogs: 1.42.13 -> 1.43.3
 2016-11-14 11:01:32 +01:00
Tobias Geerinckx-Rice
e82c325bff
btrfs-progs: 4.8.2 -> 4.8.3 2016-11-14 05:28:22 +01:00
obadz
83fe4fa0bf e2fsprogs: 1.42.13 -> 1.43.3 2016-11-13 21:03:32 +00:00
Alex Ivanov
6be6760144 yandex-disk: 0.1.5.948 -> 0.1.5.978 2016-11-12 12:02:24 +03:00
Tim Steinbach
893bfb1a1b
Remove fuse-zip 
Original sources have moved to BitBucket but clearly this is not used by anybody
 2016-11-04 09:42:39 -04:00
Joachim Fasting
0ee7d1ea4e
encfs: 1.8.1 -> 1.9.1 
Packaging changes
- Uses cmake
- Removes depends on rlog and boost, uses tinyxml to parse xml

Note that the encfssh utility is disabled, it requires patching to
work (and didn't work in previous versions of the package, either).
Better to leave it unusable until fixed.
 2016-11-01 15:57:29 +01:00
Tim Steinbach
68dd264ccd
btrfs-progs: 4.6.1 -> 4.8.2 2016-10-26 20:11:28 -04:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Peter Hoeg
cbec6a304a vmfs-tools: init at 2016-01-16 2016-10-21 13:08:00 +03:00
Vladimír Čunát
4d5b893002 Merge #19081: gnome-3.22 
Also master commits are brought in.
 2016-10-20 23:04:10 +02:00
Frederik Rietdijk
0e3b5834c0 glusterfs: use python2 
configure reports that only python2 is supported.
 2016-10-18 23:16:09 +02:00
Frederik Rietdijk
509ef439ac ceph: use python2 
print statement
 2016-10-18 23:16:04 +02:00
Frederik Rietdijk
af11ff4cdd gitfs: use python2 2016-10-18 23:14:35 +02:00
Franz Pletz
8f794cd6b8
zfstools: 0.3.3 -> 0.3.6 2016-10-14 17:34:34 +02:00
Frederik Rietdijk
104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
rnhmjoj
8546928f69
afpfs-ng: init at 0.8.2 2016-10-09 20:13:49 +02:00
Peter Hoeg
56c9c71f13 f2fs-tools: 1.6.1 -> 1.7.0 (#19352) 2016-10-08 13:44:58 +02:00
Aneesh Agrawal
fcee1d0b28
Remove redundant -DCMAKE_BUILD_TYPE=Release flags 
Since commit 183d05a0 in 2012, this is the default.

fixes #18000
 2016-10-01 16:13:41 +02:00
makefu
0b6d9734c9
snapraid: 8.1 -> 10.0 
enable tests for snapraid
 2016-10-01 14:28:53 +02:00
Jörg Thalheim
4d0ae0e754 Merge pull request #18980 from MostAwesomeDude/gcsfuse 
gcsfuse: init at v0.19.0
 2016-09-29 16:55:07 +02:00
Corbin
3f61b437ef gcsfuse: Don't depend on fuse. 2016-09-29 07:48:03 -07:00
Corbin
1819d941b0 Address code review feedback. 2016-09-28 21:47:48 -07:00
Tuomas Tynkkynen
633fb08a9a Merge pull request #19036 from makefu/init-mergerfs 
mergerfs: init at 2.16.1
 2016-09-28 23:27:43 +03:00
makefu
2960aa7f1b
mergerfs: init at 2.16.1 2016-09-28 22:17:57 +02:00
makefu
36e0aedae7
f3: init at 6.0 2016-09-28 13:31:27 +02:00
Corbin
eef90e4153 gcsfuse: init at v0.19.0 2016-09-26 07:51:50 -07:00
Michael Raskin
7a15d8b3ab nilfs-utils: 2.2.4 -> 2.2.5 2016-09-26 15:49:30 +02:00
Michael Raskin
72249360f9 glusterfs: 3.8.1 -> 3.8.4 2016-09-26 15:49:30 +02:00
Frederik Rietdijk
2f4da5bd83 gitfs: do not pass in buildPythonApplication 2016-09-26 11:10:51 +02:00
Franz Pletz
668572753c
fuseiso: fix CVE-2015-8836 & CVE-2015-8837 2016-09-25 17:38:31 +02:00
Graham Christensen
70bf407cf8
davfs2: 1.5.2 -> 1.5.3 2016-09-24 08:42:24 -04:00
Joachim F
96c436612d Merge pull request #18634 from romildo/upd.avfs 
avfs: 1.0.3 -> 1.0.4
 2016-09-17 12:25:05 +02:00
Joachim F
0ffdb89d95 Merge pull request #18628 from joachifm/squashfs-lz4 
squashfsTools: optional lz4 support
 2016-09-16 11:22:09 +02:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
José Romildo Malaquias
6cf3fdcceb avfs: 1.0.3 -> 1.0.4 2016-09-15 15:50:10 -03:00
Joachim Fasting
4653160057
squashfsTools: optional lz4 support 2016-09-15 15:37:03 +02:00
Joachim Fasting
a9fa582c5b
squashfsTools: use fetchFromGitHub 2016-09-15 15:37:03 +02:00
rushmorem
c34d83eb36 lizardfs: 3.10.0 -> 3.10.2 2016-09-14 19:24:33 +02:00
Tuomas Tynkkynen
c922c20cff e2fsprogs: Split 'dev' 2016-09-10 20:05:30 +03:00
Eelco Dolstra
78178d5854 systemd: Separate lib output 
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
 2016-09-05 19:17:14 +02:00
Rushmore Mushambi
dff7057743 Merge pull request #18227 from rushmorem/lizardfs-manpages 
lizardfs: fix building manpages
 2016-09-02 21:20:19 +02:00
rushmorem
757975c439 lizardfs: fix building manpages 2016-09-02 20:57:08 +02:00
obadz
d95a29a01a netatalk: fix build (broken since closure-size) 
Helps with #18209
 2016-09-02 19:38:48 +01:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
 2016-09-01 13:27:27 +03:00
Eelco Dolstra
02ee9d83d0 enableParallelBuild -> enableParallelBuilding 2016-09-01 10:46:47 +02:00
Tuomas Tynkkynen
96004b9d8c nilfs-utils: Set dontPatchELF due to broken RPATH by patchelf 2016-09-01 01:48:49 +03:00
Tuomas Tynkkynen
810135363e ceph: Fix 'lib.optional' use 
Produces a list of list as buildInputs.
 2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Joachim Fasting
e113db1e24
relfs: port to stdenv.mkDerivation 
https://github.com/NixOS/nixpkgs/issues/4210
 2016-08-29 01:10:33 +02:00
Robin Gloster
b37460ec63
xtreemfs: fix substituteInPlace paths 2016-08-27 21:56:45 +00:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2 
Darwin misc. fixes
 2016-08-24 11:52:27 +02:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging 
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
 2016-08-22 01:19:35 +01:00
rushmorem
940dc9b23a lizardfs: fix build 2016-08-21 20:04:15 +02:00
J Phani Mahesh
1894880b31 fuseiso: switch sf downloads to mirror:// 
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
 2016-08-20 19:14:30 +05:30
Joachim Fasting
ba0f9cfa49
Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors" 
This reverts commit 217594fd1d, reversing
changes made to 8e8a89d8a8.

Turns out it wasn't ready afterall ...
 2016-08-20 15:14:23 +02:00
J Phani Mahesh
6a7cc8327c fuseiso: switch sf downloads to mirror:// 2016-08-20 17:29:35 +05:30
Matthew Bauer
9ab5b14d56 genromfs: fix darwin build 2016-08-16 19:25:41 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov
4fb1f1ff6e bcache-tools: remove kmod from arguments 2016-08-14 22:38:27 +03:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Robin Gloster
572490bce9 udftools: remove obsolete gcc5 patch 
fixed by setting C compiler standard
 2016-08-13 09:48:26 +00:00
zimbatm
c2302f2f45 Merge pull request #17677 from kamilchm/no-go-libs-json 
buildGoPackage: remove Go deps file `libs.json`
 2016-08-12 18:13:29 +01:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json 
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
 2016-08-11 23:07:09 +02:00
Michael Raskin
c27ea9bb6b glusterfs: 3.7.11 -> 3.8.1 2016-08-11 17:57:35 +02:00
Tuomas Tynkkynen
1713255827 ceph: Add xfsprogs 4.5.0 compat patch 2016-08-11 00:50:16 +03:00
Matthew
5d433e35d5 xfsprogs: propagate libuuid 
Before, this would fail because libuuid needed to be available.

> echo '#include <xfs/xfs.h>' | cc -E -
 2016-08-11 00:50:16 +03:00
Tuomas Tynkkynen
f80508df5f xfsprogs: 4.2.0 -> 4.5.0 2016-08-08 16:46:34 +03:00
Robin Gloster
34086084fc Merge pull request #17551 from womfoo/fix/xtreemfs-openssl-build 
xtreemfs: fix build
 2016-08-08 13:24:17 +00:00
Tuomas Tynkkynen
0afbb63425 grive: Broken on Darwin 
Last successful build in 2014.

http://hydra.nixos.org/build/38308131
 2016-08-08 16:12:29 +03:00
Tuomas Tynkkynen
6df6b1d925 gpart: Broken on Darwin 
Never had a successful Darwin build.

http://hydra.nixos.org/build/38306346
 2016-08-08 16:12:29 +03:00
Rushmore Mushambi
f126b1a7a9 Merge pull request #16280 from rushmorem/lizardfs-manpages 
lizardfs: 3.9.4 -> 3.10.0
 2016-08-06 16:58:21 +02:00
rushmorem
1767de9248 lizardfs: 3.9.4 -> 3.10.0 2016-08-06 16:38:40 +02:00
Kranium Gikos Mendoza
736517e9c7 xtreemfs: fix build 2016-08-06 14:23:02 +08:00
Franz Pletz
56f03166e1 reiser4progs: disable format hardening 2016-08-04 11:09:27 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta 
Build-tested on x86_64 Linux and on Darwin.
 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Kranium Gikos Mendoza
9aee153f2b zerofree: 1.0.3 -> 1.0.4 2016-07-14 15:43:09 +02:00
Tobias Geerinckx-Rice
1d07b748c9
btrfs-progs: 4.6 -> 4.6.1 2016-06-26 02:07:20 +02:00
zimbatm
d2f9f251aa Merge pull request #16380 from elitak/dislocker 
dislocker: init at 0.6.1
 2016-06-23 15:49:07 +01:00
Eric Litak
5d3ace24e9 dislocker: init at 0.6.1 2016-06-20 16:58:21 -07:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
Kirill Elagin
17b19977cf bonnie++: upgrade to 1.97 
Also a patch with some OS X specific changes (stolen from Homebrew).
 2016-06-16 19:49:46 +03:00
Michiel Leenaars
d56850dd49 e2tools: init -> 0.0.16 2016-06-15 16:22:03 +02:00
rushmorem
c4435493aa lizardfs: init at 3.9.4 
LizardFS is a highly reliable, scalable and efficient distributed file
system.
 2016-06-15 04:23:44 +02:00
Tobias Geerinckx-Rice
9f266996b4
btrfs-progs: 4.5.3 -> 4.6 2016-06-12 00:28:55 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kamil Chmielewski
7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski
ce81a8a65d go-mtpfs: extracted from goPackages 2016-06-09 11:21:30 +02:00
Tobias Geerinckx-Rice
86f9ead288
exfat: 1.2.3 -> 1.2.4 2016-06-06 22:40:43 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát
81039713fa Merge branch 'master' into staging 
... to get the systemd update (rebuilding ~7k jobs).
 2016-05-26 16:50:22 +02:00
Tobias Geerinckx-Rice
5e6175ae91
s3backer: 1.3.1 -> 1.4.2; maintain 2016-05-25 02:06:47 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit 
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
 2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Michael Raskin
6c96968d70 glusterfs: 3.7.10 -> 3.7.11 2016-05-15 23:49:44 +02:00
Michael Raskin
4b72729691 nilfs-utils: 2.2.3 -> 2.2.4 2016-05-15 23:49:44 +02:00
Tobias Geerinckx-Rice
9385353a99
btrfs-progs: 4.5.2 -> 4.5.3 2016-05-14 16:01:33 +02:00
Tobias Geerinckx-Rice
537f0fb297
securefs: 0.3.1 -> 0.3.2 2016-05-14 16:01:33 +02:00
Joachim Fasting
e0c07070b1
duperemove: get linuxHeaders from stdenv 
Building against anything other than the headers used to build libc
doesn't really make any sense.

Also: this package is Linux specific, so mark it as such.
 2016-05-13 19:35:09 +02:00
Franz Pletz
9458198868 f2fs-tools: 1.5.0 -> 1.6.1 2016-05-13 17:27:01 +02:00
Vladimír Čunát
3e387c3e00 Merge branch 'staging' 
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
 2016-05-13 10:14:53 +02:00
Данило Глинський (Danylo Hlynskyi)
a74984d660 nixpart-0.4: fix build of multipath-tools dependency (#15359) 2016-05-12 09:39:12 +01:00
obadz
48d760c650 dosfstools: temporarily revert upgrade that breaks tests 
See #15394

Revert "dosfstools: Enable compat symlinks"
This reverts commit 346482c8d5.

Revert "dosfstools: 3.0.28 -> 4.0"
This reverts commit 135fe56183.
 2016-05-12 09:26:14 +01:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Tuomas Tynkkynen
346482c8d5 dosfstools: Enable compat symlinks 
Create these symlinks, since NixOS (and other users) can still be using
the old names:
    dosfsck -> fsck.fat
    dosfslabel -> fatlabel
    fsck.msdos -> fsck.fat
    fsck.vfat -> fsck.fat
    mkdosfs -> mkfs.fat
    mkfs.msdos -> mkfs.fat
    mkfs.vfat -> mkfs.fat

While at it, kill the makeFlags which seems unnecessary as it seems
to use a standard Autotools build (maybe this is a new thing).
 2016-05-10 08:00:16 +03:00
Tobias Geerinckx-Rice
135fe56183
dosfstools: 3.0.28 -> 4.0 2016-05-09 02:57:07 +02:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
Tobias Geerinckx-Rice
d6c3407f7b
btrfs-progs: 4.5.1 -> 4.5.2 2016-05-03 02:01:12 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Tobias Geerinckx-Rice
1249a4d750
securefs: init at 0.3.1 
Caveat, as always with such things, emptor.
 2016-05-01 21:00:50 +02:00
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Tuomas Tynkkynen
b465dc202f boost: Kill unnecessary 'lib' output 
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
 2016-04-28 00:41:28 +03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Michael Raskin
057bd04624 glusterfs: 3.7.8 -> 3.7.10 2016-04-13 14:47:04 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size 
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
 2016-04-07 14:40:51 +02:00
Robin Gloster
696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Luca Bruno
7dd90837b1 Merge pull request #14302 from Balletie/bindfs-fix 
bindfs: Let `mount` find `bindfs` mount helper
 2016-04-01 17:26:16 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Tobias Geerinckx-Rice
36aa19b105 btrfs-progs: 4.5 -> 4.5.1 
Bugfix release. Changes:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
 2016-04-01 09:32:41 +02:00
Arseniy Seroka
ca30594c87 Merge pull request #14095 from guaraqe/grive-2 
grive2: init at 0.5.0
 2016-03-31 16:48:50 +03:00
guaraqe
1d09c97ac4 grive2: init at 0.5.0 
grive2: update 0.5.0

grive2: various cosmetic changes
 2016-03-31 15:42:45 +02:00
Michael Raskin
cdb2bc77c4 davfs2: 1.4.7 -> 1.5.2; fixes the build 2016-03-31 14:14:40 +02:00
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Tuomas Tynkkynen
71d7eaf55d ntfs-3g: 2015.3.14 -> 2016.2.22; maintain 
Also old homepage seems to be in a redirect loop.
 2016-03-30 20:57:00 +03:00
Balletie
d852a23662 bindfs: Let mount find bindfs mount helper 
When mount is used with mount-type "fuse.bindfs", it cannot find the
mount helper.

If mount can't find `mount.fuse.bindfs`, it executes the `mount.fuse`
mount helper and passes `fuse.bindfs` as argument. Then `mount.fuse`
tries to execute `bindfs` on its own, but it is not found in the PATH.

By creating a `mount.fuse.bindfs` link to the `bindfs` executable, this
problem is avoided because `mount` will just execute the
`mount.fuse.bindfs` mount helper without `mount.fuse` in the middle.
 2016-03-29 16:40:11 +02:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
joachifm
4989fd85d4 Merge pull request #14210 from LatitudeEngineering/latitude/topic/genromfs 
genromfs: init at 0.5.2
 2016-03-28 03:41:38 +00:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Patrick Callahan
387e15764b genromfs: init at 0.5.2 2016-03-26 10:35:26 -07:00