Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2f7152f997feca9261a67fd9368dc3547d676c5b
      
https://github.com/NixOS/nixpkgs/commit/2f7152f997feca9261a67fd9368dc3547d676c5b
  Author: Niklas Hambüchen <m...@nh2.me>
  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 <m...@nh2.me>
  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 <m...@nh2.me>
  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 <m...@nh2.me>
  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 <m...@nh2.me>
  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 <m...@nh2.me>
  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 <mtakeda.enig...@gmail.com>
  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 <justin.h...@posteo.de>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    A pkgs/development/python-modules/future/default.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pythonPackages.future: 0.15.2 -> 0.16.0

Also moved the expression from python-packages.nix to 
./pkgs/development/python-modules/future/default.nix due to discussion in #26220
Used fetchPypi insted of fetchurl.


  Commit: 26b69109be4eb6c57eba174e0b26dc1f94657037
      
https://github.com/NixOS/nixpkgs/commit/26b69109be4eb6c57eba174e0b26dc1f94657037
  Author: Masayuki Takeda <mtakeda.enig...@gmail.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    A pkgs/development/python-modules/fonttools/default.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  move fonttools to its own directory


  Commit: 84ce0d87b821f409bb8c16fbe8e94fbc8a626b50
      
https://github.com/NixOS/nixpkgs/commit/84ce0d87b821f409bb8c16fbe8e94fbc8a626b50
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    A pkgs/development/python-modules/future/default.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge pull request #26220 from erictapen/python-future-bump

pythonPackages.future: 0.15.2 -> 0.16.0


  Commit: 24ea567fb499df8be2023cd0b6ee93c634abf1fc
      
https://github.com/NixOS/nixpkgs/commit/24ea567fb499df8be2023cd0b6ee93c634abf1fc
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    A pkgs/development/python-modules/fonttools/default.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge pull request #26079 from mt-caret/fonttools-3.13.0

fonttools: 3.0 -> 3.13.0


  Commit: f30dd71a388b327102a8bbc628aed1b04488e44d
      
https://github.com/NixOS/nixpkgs/commit/f30dd71a388b327102a8bbc628aed1b04488e44d
  Author: Joachim Schiele <j...@lastlog.de>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M pkgs/development/go-modules/generic/default.nix

  Log Message:
  -----------
  go-modules/generic: add missing PATHs to GOPATH when using nix-shell (#26176)


  Commit: 40e94d56075ba511a7e09e2b7d04e120b96df2fb
      
https://github.com/NixOS/nixpkgs/commit/40e94d56075ba511a7e09e2b7d04e120b96df2fb
  Author: Daniel Brockman <dan...@brockman.se>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M pkgs/applications/altcoins/seth.nix

  Log Message:
  -----------
  seth: 0.5.0 -> 0.5.1


  Commit: 87ee5896fb46203ca26af9b22c6b524cc1de195f
      
https://github.com/NixOS/nixpkgs/commit/87ee5896fb46203ca26af9b22c6b524cc1de195f
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  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-hardcodes.patch

  Log Message:
  -----------
  Merge pull request #25709 from nh2/25620-glusterfs-fix-python-import-errors

Fix: GlusterFS python tools all have import errors


  Commit: f09d104b41da01e81a5b2906c2a960e7d01b794a
      
https://github.com/NixOS/nixpkgs/commit/f09d104b41da01e81a5b2906c2a960e7d01b794a
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M pkgs/applications/altcoins/seth.nix

  Log Message:
  -----------
  Merge pull request #26306 from dbrock/seth

seth: 0.5.0 -> 0.5.1


  Commit: f16a9f694e97db99c7a26cb5c2de3df343f82efb
      
https://github.com/NixOS/nixpkgs/commit/f16a9f694e97db99c7a26cb5c2de3df343f82efb
  Author: Bjørn Forsman <bjorn.fors...@gmail.com>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M pkgs/development/tools/misc/cgdb/default.nix

  Log Message:
  -----------
  cgdb: remove unneeded 'help2man' dependency

Unused since version 0.7.0:

  https://raw.githubusercontent.com/cgdb/cgdb/v0.7.0/NEWS


  Commit: 92b923b378d34efea3bbcc9470bc50abc7be884d
      
https://github.com/NixOS/nixpkgs/commit/92b923b378d34efea3bbcc9470bc50abc7be884d
  Author: Zetok Zalbavar <ze...@openmailbox.org>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M nixos/modules/services/networking/i2pd.nix

  Log Message:
  -----------
  i2pd: correct docs about bandwidth setting


  Commit: 01ef91aa045b1597769a0b53a1b03c8d2fe9ae55
      
https://github.com/NixOS/nixpkgs/commit/01ef91aa045b1597769a0b53a1b03c8d2fe9ae55
  Author: Edward Tjörnhammar <e...@cflags.cc>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M pkgs/tools/networking/i2pd/default.nix

  Log Message:
  -----------
  i2pd: 2.13.0 -> 2.14.0


  Commit: 68faf5d5e5e1583568f9f14a6dbc5dacb3334e7d
      
https://github.com/NixOS/nixpkgs/commit/68faf5d5e5e1583568f9f14a6dbc5dacb3334e7d
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M pkgs/development/python-modules/hypothesis.nix

  Log Message:
  -----------
  python.pkgs.hypothesis: fix hash

Update script used hash from PyPI while hypothesis was fetched from
GitHub.

https://github.com/NixOS/nixpkgs/commit/2050213c54a9dd7c7fdca28402b7720ece3217b2#commitcomment-22374103


  Commit: e2b0896cf6214a43613ba921b04148e7d8e86bac
      
https://github.com/NixOS/nixpkgs/commit/e2b0896cf6214a43613ba921b04148e7d8e86bac
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M nixos/modules/services/network-filesystems/glusterfs.nix
    M nixos/modules/services/networking/i2pd.nix
    M pkgs/applications/altcoins/seth.nix
    M pkgs/development/go-modules/generic/default.nix
    A pkgs/development/python-modules/fonttools/default.nix
    A pkgs/development/python-modules/future/default.nix
    M pkgs/development/python-modules/hypothesis.nix
    M pkgs/development/tools/misc/cgdb/default.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-hardcodes.patch
    M pkgs/tools/networking/i2pd/default.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into HEAD


Compare: https://github.com/NixOS/nixpkgs/compare/2f129026a7cd...e2b0896cf621
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to