Commit graph

789 commits

Author SHA1 Message Date
Bjørn Forsman 581226cfb4 nixos/bcache: /bin/sh -> ${bash}/bin/sh
Or else `services.udev.packages = [ bcache-tools ]` cannot be used.

To not break bcache in the initrd I'm modifying this in stage-1.nix:

  -  --replace /bin/sh ${extraUtils}/bin/sh
  +  --replace ${bash}/bin/sh ${extraUtils}/bin/sh

Reasoning behind that change:

* If not modifying the /bin/sh pattern in any way, it will also match
  ${bash}/bin/sh, creating a broken path like
  /nix/store/HASH-bash/nix/store/HASH-bash/bin/sh in the udev rule file.

* The addition of /bin/sh was done in 775f381a9e
  ("stage-1: add bcache support"). It seems somewhat plausible that
  no new users have appeared since then and we can take this opportunity
  to back out of this change without much fear of regressions.

  If there _are_ regressions, they should be in the form of build time
  errors, not runtime (boot), due to how the udev rule output is checked
  for invalid path references. So low risk, IMHO.

* An alternative approach could be to copy the /bin/sh substitute rule
  over to the non-initrd udev rules implementation in NixOS, but I think
  this way is better:
  - The rules file comes with a working path out of the box.
  - We can use more precise pattern matching when modifying the udev
    rules for the initrd.
2017-06-10 17:10:49 +02:00
Bjørn Forsman f12b0a2179 bcache-tools: add name to the source store path
So that

 $ nix-build -A bcache-tools.src

gives

 /nix/store/HASH-bcache-tools-1.0.7.tar.gz

instead of

 /nix/store/HASH-v1.0.7.tar.gz
2017-06-10 17:10:49 +02:00
Frederik Rietdijk 87ee5896fb Merge pull request #25709 from nh2/25620-glusterfs-fix-python-import-errors
Fix: GlusterFS python tools all have import errors
2017-06-01 22:06:21 +02:00
Niklas Hambüchen 13eefe13cd glusterfs: Upgrade to 3.10.2 2017-05-19 16:56:31 +02:00
Niklas Hambüchen 01bbdae2fe glusterfs: Enable parallel building.
I checked for determinism with `nix-build --option build-repeat 10`.
2017-05-19 16:56:30 +02:00
Niklas Hambüchen 85f6ff48e1 glusterfs: Make commands that gluster calls work. Fixes #25620.
Done by setting PATH and PYTHONPATH appropriately.

Adds the following patches:

* One that removes hardcodes to /sbin, /usr/bin, etc.
  from gluster, so that programs like `lvm` and `xfs_info` can be
  called at runtime; see https://bugzilla.redhat.com/show_bug.cgi?id=1450546.
* One that fixes unsubstituted autoconf macros in paths (a problem
  in the 3.10 release); see https://bugzilla.redhat.com/show_bug.cgi?id=1450588.
* One that removes uses of the `find_library()` Python function that does
  not behave as expected in Python < 3.6 (and would not behave correctly
  even on 3.6 in nixpkgs due to #25763);
  see https://bugzilla.redhat.com/show_bug.cgi?id=1450593.

I think that all of these patches should be upstreamed.

Also adds tests to check that none of the Python based utilities
throw import errors, calling `--help` or equivalent on them.
2017-05-19 16:56:30 +02:00
Niklas Hambüchen 833acf9ff1 glusterfs: Use github instead of download.gluster.org to obtain source.
This is because the source tarball available on
  https://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.1/glusterfs-3.10.1.tar.gz
has different contents than the v3.10.1 tag;
for example, it lacks the file `xlators/features/ganesha/src/Makefile.am`,
which the tag has.
This is because GluserFS's release process removes some unused files.

This made impossible to apply patches written by or for upstream, as those
are written against what's in upstream's git.

As a nice side effect, we no longer have to hardcode the "3.10" in the
`3.10/${version}` part of the URL.
2017-05-19 16:56:30 +02:00
Niklas Hambüchen 2f7152f997 glusterfs: Remove no longer needed subsitutions of DESTDIR.
They were made unnecessary in commit d07154b3bc, which added
`makeFlags = "DESTDIR=$(out)";`.
2017-05-19 16:56:30 +02:00
Jörg Thalheim ccb850248f
bcachefs-tools: 2017-05-08 -> 2017-05-12 2017-05-19 13:24:50 +01:00
Jörg Thalheim db70f2958a Merge pull request #25580 from davidak/bcachefs-tools
bcachefs-tools: init at a588eb0
2017-05-19 13:16:58 +01:00
Tuomas Tynkkynen 640d434ddb sshfs-fuse: 2.7 -> 2.9 2017-05-14 15:22:09 +03:00
George Whewell 867e7f4dcf fix dosfstools build on darwin 2017-05-13 11:27:19 +01:00
davidak 26294f40c3 bcachefs-tools: init at a588eb0 2017-05-10 00:22:33 +02:00
Joachim F 3c320fe7b1 Merge pull request #19898 from bzizou/irods4.2
irods: init at 4.2.0
2017-05-06 18:19:04 +01:00
John Ericson 37e5e71fdf Merge pull request #24974 from Ericson2314/mapNullable
Introduce `mapNullable` into lib and use it in a few places
2017-04-17 17:12:14 -04:00
John Ericson 85aa5005af Introduce mapNullable into lib and use it in a few places
Also simply some configure flag logic my grep also alerted me too.
2017-04-17 17:04:04 -04:00
Tuomas Tynkkynen 52797fc600 Merge remote-tracking branch 'upstream/master' into staging 2017-04-11 12:58:43 +03:00
Tuomas Tynkkynen b002d6a868 Revert "btrfs-progs: 4.8.2 -> 4.10.2"
This reverts commit c0cef0425e.

The output of the command-line tool has changed somewhat and at least
nixos-generate-config.pl needs modifications to match. I'm leaving that
to someone who knows a bit more about btrfs.

Issue #24810.
2017-04-11 09:54:43 +03:00
Tuomas Tynkkynen 9ae8ce813e dosfstools: Use --enable-compat-symlinks
http://hydra.nixos.org/build/51461475
2017-04-11 09:37:45 +03:00
Dan Peebles 0b034797e1 bonnie: fix on Darwin 2017-04-10 23:08:14 -04:00
Tuomas Tynkkynen c0cef0425e btrfs-progs: 4.8.2 -> 4.10.2 2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen 199be99c6f dosfstools: 3.0.28 -> 4.1 2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen 183279002d f2fs-tools: 1.7.0 -> 1.8.0 2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen c334daa5c2 f2fs-tools: Cleanup a bit 2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen b64163a90d bonnie: 1.97 -> 1.97.3 2017-04-10 01:16:39 +03:00
Tuomas Tynkkynen 1f625ce93e ntfs3g: 2016.2.22 -> 2017.3.23 2017-04-09 21:48:25 +03:00
Peter Simons 4e307b644a Merge pull request #24760 from matthewbauer/linux-only-pkgs
Mark linux-only pkgs
2017-04-09 14:18:10 +02:00
Matthew Bauer 038550b596
gcsfuse: make linux-only 2017-04-08 23:34:52 -05:00
Michael Raskin 16e12a6c42 glusterfs: 3.10.0 -> 3.10.1 2017-04-08 18:37:24 +02:00
Daiderd Jordan 2aeafc16c8 Merge pull request #24559 from georgewhewell/mtools-darwin
mtools: fix build on darwin
2017-04-05 00:40:09 +02:00
George Whewell 9b1a70f1ac mtools: fix build on darwin 2017-04-04 23:32:06 +01:00
makefu 1a0a60482b
snapraid: 11.0 -> 11.1
build from source, not the release configure scripts already generated
2017-04-03 10:44:15 +02:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Michael Raskin 1fc3486154 glusterfs: 3.9.1 -> 3.10.0 2017-03-09 18:47:38 +01:00
Tuomas Tynkkynen 2552b034ab unionfs-fuse: Use fetchFromGitHub 2017-03-04 02:14:22 +02:00
Jörg Thalheim 0c24151731 Merge pull request #23398 from rnhmjoj/gitfs
gitfs: 0.2.5 -> 0.4.5.1
2017-03-02 20:52:43 +01:00
rnhmjoj 1b9875220f
gitfs: 0.2.5 -> 0.4.5.1 2017-03-02 16:35:33 +01:00
Robin Gloster 6034d429fc
btrfs-dedupe: dependency is broken on i686 2017-03-02 14:23:41 +01:00
Felix Richter e748e18dde mhddfs: fix-format-security (#23276)
* mhddfs: fix-format-security

* mhddfs: use fputs instead of fprintf
2017-02-28 15:53:50 +01:00
Peter Hoeg 23004ec6dc s3fs: minor cleanups 2017-02-28 17:59:09 +08:00
Robin Gloster 5dde5ded09
zkfuse: remove applied patch 2017-02-27 12:38:58 +01:00
Vladimír Čunát 488ece8169
e2fsprogs: avoid larger rebuild on Linux
I didn't notice this.  Perhaps it's through libarchive.
2017-02-26 11:01:44 +01:00
Vladimír Čunát 6afdc516b5
e2fsprogs: style nitpicks, add meta.license 2017-02-26 10:56:11 +01:00
Gavin Rogers 57212c947b e2fsprogs: fix on Darwin (#22973)
util-linux cowardly refuses to install on all platforms. Therefore we
cannot rely on it for external dependancies, in particular luuid.
e2fsprogs won't configure without the luuid dependancy being satisfied.
2017-02-26 10:49:56 +01:00
Jörg Thalheim f4c253ff2f
jfsutils: replace sha1 with sha256 2017-02-26 10:05:40 +01:00
ikervagyok 0860565ee0 btrfs-dedupe: init at 1.1.0 (#22938) 2017-02-18 22:20:42 +01:00
Vladimír Čunát 432dba859e
Merge branch 'staging'
A security update of libxml2 is within.
2017-02-18 08:59:29 +01:00
Armijn Hemel 34c12b1c73
e2fsprogs: 1.43.3 -> 1.43.4 2017-02-17 23:46:09 +01:00
Eelco Dolstra 4798196447
s3fs-fuse: 1.78 -> 1.80 2017-02-17 13:46:00 +01:00
Robin Gloster 79e6596993
s3backer: 1.4.2 -> 1.4.3 2017-02-17 00:12:09 +01:00