Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libs: make splitString also split last separator #23851

Merged
merged 2 commits into from Mar 15, 2017
Merged

libs: make splitString also split last separator #23851

merged 2 commits into from Mar 15, 2017

Conversation

Ekleog
Copy link
Member

@Ekleog Ekleog commented Mar 13, 2017

This should fix #23681.

I have tested using nix-repl, not tested every file using it as hydra should be able to do it better than me.

Hope that helps!

@mention-bot
Copy link

@Ekleog, thanks for your PR! By analyzing the history of the files in this pull request, we identified @zimbatm, @edolstra and @nbp to be potential reviewers.

@Ekleog Ekleog mentioned this pull request Mar 13, 2017
Closed
zimbatm
zimbatm reviewed Mar 14, 2017
View reviewed changes
Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even if technically it's a breaking change, it shouldn't happen most of the time and it makes the function more in line with any other language that I have used.

I would still live to see some tests added to the code before approving the change.

@Ekleog
Copy link
Member Author

Ekleog commented Mar 14, 2017

@zimbatm : I've just pushed a commit filling in lib/tests.nix, is that what you meant? (checked it worked by using nix-instantiate --eval --strict --show-trace lib/tests.nix, found by git grep'ing for "tests.nix", it seems to work) Or is it more tests like the ones @vcunat exposed here that you're speaking about?

@zimbatm
Copy link
Member

zimbatm commented Mar 15, 2017

Yeah thanks for taking the time and figuring this out. I suppose we should have a better testing framework in place but that will do.

@zimbatm zimbatm merged commit da6619c into NixOS:staging Mar 15, 2017
@orivej orivej mentioned this pull request Mar 19, 2017
Closed
7 tasks
vcunat added a commit that referenced this pull request Mar 19, 2017
@vcunat
readPathsFromFile: fixup after #23851
36de745 
The final newline would produce an empty string;
let's filter all empty lines as well.
vcunat added a commit that referenced this pull request Mar 19, 2017
@vcunat
fetchsvn: fixup name guessing after #23851
3ca0990 
I can't see any unfixed differences due to that PR,
at least in nix-env -qa output for the four Hydra platforms.
@vcunat
Copy link
Member

vcunat commented Mar 19, 2017

All problems are probably fixed now.

@zimbatm
Copy link
Member

zimbatm commented Mar 19, 2017

you're the best @vcunat

@butterflya
Copy link
Contributor

butterflya commented Mar 19, 2017 •
edited

Why do we merge such a horrible implementation? (The first version was horrible too, of course, but this would have been a good occasion to fix it.)

Compare with how Haskell does it (which is better): http://hackage.haskell.org/package/split-0.1.2.3/docs/src/Data-List-Split-Internals.html#splitOn

@zimbatm
Copy link
Member

zimbatm commented Mar 20, 2017

@butterflya I'm not sure of what you're complaining about. Do you mean that you want to change the semantic so that strings.splitString "." "a..b" returns ["a" ".b"]?

@butterflya
Copy link
Contributor

@zimbatm No, the point I was trying to make is that the Haskell implementation is composed of other functions and is a one liner. The version in Nix is the complete opposite of that.

I don't think we should unmerge it again (for the sake of progress), but I am saying that there is much room for improvement.

@vcunat
Copy link
Member

vcunat commented Mar 20, 2017

I think the (original) author had performance in mind. Nix lists are monolithic arrays, unlike what functional languages typically provide.

@zimbatm
Copy link
Member

zimbatm commented Mar 20, 2017

@butterflya in that case the occasion is not lost, you can still propose the improvements in a separate PR. And thanks to the tests provided in this PR it will also make it easier to test for conformance.

MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/overlays' into experimental…
8ff6ba7 
…/overlays

* commit 'refs/top-bases/experimental/overlays': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'experimental/overlays' into refs/top-bases/experimental…
7804f96 
…/hack-nix

* experimental/overlays: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/hack-nix' into experimental…
fcc1195 
…/hack-nix

* commit 'refs/top-bases/experimental/hack-nix': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/parallel-building' into exp…
21cbc6a 
…erimental/parallel-building

* commit 'refs/top-bases/experimental/parallel-building': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/eclipse
d8e65c4 
* master: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/eclipse' into experimental/…
f9c3ce0 
…eclipse

* commit 'refs/top-bases/experimental/eclipse': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/inkscape' into experimental…
f7749a4 
…/inkscape

* commit 'refs/top-bases/experimental/inkscape': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/plover' into experimental/p…
f1ec6c5 
…lover

* commit 'refs/top-bases/experimental/plover': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/nginx' into experimental/nginx
ee6485f 
* commit 'refs/top-bases/experimental/nginx': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/opera' into experimental/opera
e57ed4b 
* commit 'refs/top-bases/experimental/opera': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/vim-plugins-us…
bd08f01 
…ed-by-marc-weber

* master: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/vsftpd' into experimental/v…
cfeb232 
…sftpd

* commit 'refs/top-bases/experimental/vsftpd': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/php
f165277 
* master: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/php' into experimental/php
cec2696 
* commit 'refs/top-bases/experimental/php': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/ruby
3c01c87 
* master: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/ruby' into experimental/ruby
c419c79 
* commit 'refs/top-bases/experimental/ruby': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/marc-nixos/postfix' into marc-nixos/postfix
bbbf105 
* commit 'refs/top-bases/marc-nixos/postfix': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/gimp-git' into experimental…
8dd0e03 
…/gimp-git

* commit 'refs/top-bases/experimental/gimp-git': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/gutenprint
fc09145 
* master: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/gutenprint' into experiment…
8cbee0f 
…al/gutenprint

* commit 'refs/top-bases/experimental/gutenprint': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/nixos-module-resource-track…
85d905f 
…ing' into experimental/nixos-module-resource-tracking

* commit 'refs/top-bases/experimental/nixos-module-resource-tracking': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/marc-nixos/multi-shell-support' into mar…
83947ac 
…c-nixos/multi-shell-support

* commit 'refs/top-bases/marc-nixos/multi-shell-support': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/multiple-mysql…
2b5d610 
…d-instances

* master: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/multiple-mysqld-instances' …
7b12939 
…into experimental/multiple-mysqld-instances

* commit 'refs/top-bases/experimental/multiple-mysqld-instances': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/mercurial' into experimenta…
760cfe6 
…l/mercurial

* commit 'refs/top-bases/experimental/mercurial': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/haxe
f7c067b 
* master: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/haxe' into experimental/haxe
6b64702 
* commit 'refs/top-bases/experimental/haxe': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'experimental/overlays' into refs/top-bases/experimental…
b186fc8 
…/updates

* experimental/overlays: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/updates' into experimental/…
5e64133 
…updates

* commit 'refs/top-bases/experimental/updates': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/fonts' into experimental/fonts
5579ddc 
* commit 'refs/top-bases/experimental/fonts': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/nix' into experimental/nix
514324f 
* commit 'refs/top-bases/experimental/nix': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/blender
559e93a 
* master: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/blender' into experimental/…
49ac894 
…blender

* commit 'refs/top-bases/experimental/blender': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/opencascade' into experimen…
46f5e57 
…tal/opencascade

* commit 'refs/top-bases/experimental/opencascade': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'experimental/updates' into refs/top-bases/experimental/…
5e6542e 
…marc

* experimental/updates: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge branch 'experimental/gutenprint' into refs/top-bases/experiment…
12fd9a0 
…al/cups-1.6-and-1.7

* experimental/gutenprint: (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/cups-1.6-and-1.7' into expe…
3ca25a7 
…rimental/cups-1.6-and-1.7

* commit 'refs/top-bases/experimental/cups-1.6-and-1.7': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/marc-nixos/virtualbox-server' into marc-…
2ade246 
…nixos/virtualbox-server

* commit 'refs/top-bases/marc-nixos/virtualbox-server': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/arangodb' into experimental…
262fd89 
…/arangodb

* commit 'refs/top-bases/experimental/arangodb': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Mar 24, 2017
@MarcWeber
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc
4266acd 
* commit 'refs/top-bases/experimental/marc': (127 commits)
  djview: 4.10.5 -> 4.10.6 (NixOS#24029)
  kdiff3: fix build
  createrepo_c: fix build
  qtbase-* nitpick: fix list nesting
  fetchsvn: fixup name guessing after NixOS#23851
  feh: 2.18.1 -> 2.18.2
  yubikey-manager: init at 0.3.1
  readPathsFromFile: fixup after NixOS#23851
  pythonPackages.pytest-django: fix hash patch setuptools_scm
  colort: PR tweaks
  jam: 2.5 -> 2.6
  rapcad: 0.9.5 -> 0.9.8
  gthumb: 3.4.4 -> 3.5.1
  pqiv: 0.12 -> 2.8.3
  potrace: 1.13 -> 1.14
  meh: init at unstable-2015-04-11
  windowmaker: 0.95.7 -> 0.95.8
  colort: init at unstable-2017-03-13
  vsftpd: Expose the no_anon_password flag.
  handbrake: 0.10.5 -> 1.0.3
  ...
veprbl pushed a commit to veprbl/nixpkgs that referenced this pull request Jul 16, 2017
@Ekleog @veprbl
libs: make splitString also split last separator (NixOS#23851)
78ad101 
* libs: make splitString also split last separator

* libs: add tests for splitStrings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimbatm zimbatm zimbatm left review comments

@globin globin globin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Ekleog @mention-bot @zimbatm @vcunat @butterflya @globin