[Nix-commits] [NixOS/nixpkgs] 2f7152: glusterfs: Remove no longer needed subsitutions of...

2017-06-01 Thread Frederik Rietdijk
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2f7152f997feca9261a67fd9368dc3547d676c5b
  
https://github.com/NixOS/nixpkgs/commit/2f7152f997feca9261a67fd9368dc3547d676c5b
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix

  Log Message:
  ---
  glusterfs: Remove no longer needed subsitutions of DESTDIR.

They were made unnecessary in commit d07154b3bc8, which added
`makeFlags = "DESTDIR=$(out)";`.


  Commit: 833acf9ff1aad07193c405e934d8c4982a45837f
  
https://github.com/NixOS/nixpkgs/commit/833acf9ff1aad07193c405e934d8c4982a45837f
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix

  Log Message:
  ---
  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.


  Commit: 85f6ff48e1eea58fc728c4ffe4f35afe2a2e18b7
  
https://github.com/NixOS/nixpkgs/commit/85f6ff48e1eea58fc728c4ffe4f35afe2a2e18b7
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix
A 
pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch
A 
pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
A 
pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch

  Log Message:
  ---
  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.


  Commit: 01bbdae2fea6b68c05ff1c5b14a0243854861600
  
https://github.com/NixOS/nixpkgs/commit/01bbdae2fea6b68c05ff1c5b14a0243854861600
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix

  Log Message:
  ---
  glusterfs: Enable parallel building.

I checked for determinism with `nix-build --option build-repeat 10`.


  Commit: ff4eb1eaa6693dbdee5e186f8c9832c11c51f9c7
  
https://github.com/NixOS/nixpkgs/commit/ff4eb1eaa6693dbdee5e186f8c9832c11c51f9c7
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M nixos/modules/services/network-filesystems/glusterfs.nix

  Log Message:
  ---
  glusterfs service: Copy hooks to /var at startup.

This is where glusterfs expects them; see also
https://github.com/gluster/glusterfs/blob/v3.10.1/extras/hook-scripts/Makefile.am#L4

Also see upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761


  Commit: 13eefe13cd719f2d028d87a895b39189da5c8653
  
https://github.com/NixOS/nixpkgs/commit/13eefe13cd719f2d028d87a895b39189da5c8653
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix
M 
pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch

  Log Message:
  ---
  glusterfs: Upgrade to 3.10.2


  Commit: 4e3afed6dc13d2a268ec4bd43d9960910e8571d5
  
https://github.com/NixOS/nixpkgs/commit/4e3afed6dc13d2a268ec4bd43d9960910e8571d5
  Author: Masayuki Takeda 
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  fonttools: 3.0 -> 3.13.0


  Commit: e6b65c04fa9752eeeb41241638852af901389406
  
https://github.com/NixOS/nixpkgs/commit/e6b65c04fa9752eeeb41241638852af901389406
  Author: Justin Humm 
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
A pkgs/development/python-modules/future

[Nix-commits] [NixOS/nixpkgs] 2f7152: glusterfs: Remove no longer needed subsitutions of...

2017-06-01 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2f7152f997feca9261a67fd9368dc3547d676c5b
  
https://github.com/NixOS/nixpkgs/commit/2f7152f997feca9261a67fd9368dc3547d676c5b
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix

  Log Message:
  ---
  glusterfs: Remove no longer needed subsitutions of DESTDIR.

They were made unnecessary in commit d07154b3bc8, which added
`makeFlags = "DESTDIR=$(out)";`.


  Commit: 833acf9ff1aad07193c405e934d8c4982a45837f
  
https://github.com/NixOS/nixpkgs/commit/833acf9ff1aad07193c405e934d8c4982a45837f
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix

  Log Message:
  ---
  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.


  Commit: 85f6ff48e1eea58fc728c4ffe4f35afe2a2e18b7
  
https://github.com/NixOS/nixpkgs/commit/85f6ff48e1eea58fc728c4ffe4f35afe2a2e18b7
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix
A 
pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch
A 
pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
A 
pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch

  Log Message:
  ---
  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.


  Commit: 01bbdae2fea6b68c05ff1c5b14a0243854861600
  
https://github.com/NixOS/nixpkgs/commit/01bbdae2fea6b68c05ff1c5b14a0243854861600
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix

  Log Message:
  ---
  glusterfs: Enable parallel building.

I checked for determinism with `nix-build --option build-repeat 10`.


  Commit: ff4eb1eaa6693dbdee5e186f8c9832c11c51f9c7
  
https://github.com/NixOS/nixpkgs/commit/ff4eb1eaa6693dbdee5e186f8c9832c11c51f9c7
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M nixos/modules/services/network-filesystems/glusterfs.nix

  Log Message:
  ---
  glusterfs service: Copy hooks to /var at startup.

This is where glusterfs expects them; see also
https://github.com/gluster/glusterfs/blob/v3.10.1/extras/hook-scripts/Makefile.am#L4

Also see upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761


  Commit: 13eefe13cd719f2d028d87a895b39189da5c8653
  
https://github.com/NixOS/nixpkgs/commit/13eefe13cd719f2d028d87a895b39189da5c8653
  Author: Niklas Hambüchen 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/tools/filesystems/glusterfs/default.nix
M 
pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch

  Log Message:
  ---
  glusterfs: Upgrade to 3.10.2


  Commit: 87ee5896fb46203ca26af9b22c6b524cc1de195f
  
https://github.com/NixOS/nixpkgs/commit/87ee5896fb46203ca26af9b22c6b524cc1de195f
  Author: Frederik Rietdijk 
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
M nixos/modules/services/network-filesystems/glusterfs.nix
M pkgs/tools/filesystems/glusterfs/default.nix
A 
pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch
A 
pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
A 
pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardco