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.

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

Create a networking.proxy option #5058

Closed

Conversation

ardumont
Copy link
Contributor

Following the discussion from #5021

Code:

  • obsolete the nix.proxy option
  • add the networking.proxy option
  • open a default no_proxy environment variable
  • add a rsync option

Tests:

  • Manual tests ok.
  • Automatic tests added and ok

Note:
Code rebased to the latest code.
I do not know if it's a good idea.

@ardumont ardumont force-pushed the create-networking-proxy-function branch from 01db43b to e7c7ca5 Compare November 19, 2014 23:22
@ardumont
Copy link
Contributor Author

Hello,

Do I need to squash the commits?

If anything is wrong, I'll adapt the code accordingly.

Cheers,

@lucabrunox
Copy link
Contributor

The idea is good, but I think with an option like that the user expects the proxy to be system-wide and not only for nix. Also I feel networking.envVars is wrong, should mention it's for proxy.

@ardumont
Copy link
Contributor Author

Hello, while working on gnome3-14 for nix, you still have time (and courage :) to answer in other threads, nice!

The idea is good, but I think with an option like that the user expects the proxy to be system-wide and not only for nix.

What do you mean by system-wide?
It is system-wide for me (because it results in /etc/profile), what did I miss?

Also I feel networking.envVars is wrong, should mention it's for proxy.

Right!
Will fix.

Thanks

@lucabrunox
Copy link
Contributor

Ops didn't see the sessionVariables line. Btw I mean, maybe it's better to call it networking.proxy.envVars or something like that. Not sure.

@ardumont
Copy link
Contributor Author

Ops didn't see the sessionVariables line.

Ok. Cool.

Btw I mean, maybe it's better to call it networking.proxy.envVars or something like that.

Right again!
Will fix.

Thanks!

@jagajaga
Copy link
Member

Nice! That's what I was finding in days.

@ardumont
Copy link
Contributor Author

@lethalman I called it networking.envVarsProxy because it complained about already defined networking.proxy otherwise... (with networking.proxy.envVars, the prefix is the same and it seems to be problematic)

@ardumont
Copy link
Contributor Author

Nice! That's what I was finding in days.

Do you mean looking for?
Great news then!

Cheers,

@jagajaga
Copy link
Member

Hah, yeah. Sorry for my english.

2014-11-21 0:16 GMT+03:00 Antoine R. Dumont notifications@github.com:

Nice! That's what I was finding in days.

Do you mean looking for?
Great news then!

Cheers,


Reply to this email directly or view it on GitHub
#5058 (comment).

Sincerely,
Arseniy Seroka

@ardumont
Copy link
Contributor Author

Sorry for my english.

No problem, just making sure I understood you right :D

@ardumont ardumont force-pushed the create-networking-proxy-function branch from 26ee55b to 09c704e Compare November 20, 2014 23:21
@ardumont
Copy link
Contributor Author

Commits squashed into 1.

@lucabrunox
Copy link
Contributor

Looks good to me in principle, maybe @edolstra has a better name for envVarsProxy?

@ardumont
Copy link
Contributor Author

Hello,

does anyone has a better name than networking.envVarsProxy?

@wmertens
Copy link
Contributor

How about calling them networking.proxy.default, networking.proxy.http, networking.proxy.https etc.
Then set e.g. http_proxy to networking.proxy.http or networking.proxy.default or don't set it.

@ardumont
Copy link
Contributor Author

How about calling them networking.proxy.default, networking.proxy.http, networking.proxy.https etc.
Then set e.g. http_proxy to networking.proxy.http or networking.proxy.default or don't set it.

Seems good because that takes into account people that may have more specific configuration.
I'll adapt this then.

Does someone see any other catch?
For example, is the location of networking.proxy (inside config/networking.nix) ok or should it be elsewhere?

Cheers,

@jagajaga
Copy link
Member

This location is good.

On November 24, 2014 11:49:25 AM "Antoine R. Dumont"
notifications@github.com wrote:

How about calling them networking.proxy.default, networking.proxy.http,
networking.proxy.https etc.
Then set e.g. http_proxy to networking.proxy.http or
networking.proxy.default or don't set it.

Seems good because that takes into account people that may have more
specific configuration.
I'll adapt this then.

Does someone see any other catch?
For example, is the location of networking.proxy (inside
config/networking.nix) or should it be elsewhere?

Cheers,


Reply to this email directly or view it on GitHub:
#5058 (comment)

@ardumont
Copy link
Contributor Author

This location is good.

Ok. Thanks

@ardumont
Copy link
Contributor Author

Hello,

After following the multiple suggestions, here is the latest description for this PR:

Code:

  • obsolete the nix.proxy option (an information message will appear when building with it).
  • add the networking.proxy.default option which is the equivalent of the old nix.proxy (+ new rsync_proxy and no_proxy environment variables).
  • add the export of the rsync_proxy environment variable
  • open a default no_proxy environment variable
  • open http-proxy, https-proxy, rsync-proxy, ftp-proxy and no-proxy options
  • when networking.proxy.default is filled, this automatically exports the http_proxy, https_proxy, ftp_proxy, rsync_proxy with this value. This also exports a minimalistic default no_proxy environment variables with 127.0.0.1,localhost.
  • when networking.proxy.default is filled and some other specific options (http-proxy, https-proxy, rsync-proxy, ftp-proxy, no-proxy) is declared, all those *_proxy variables are set with the networking.proxy.default value except for the one explicitely specified (which then are filled according to their respective options)
  • when networking.proxy.default is empty, only specific proxy environment variable (according to their specific proxy option) will be exported
  • if no proxy option is set, then no proxy environment variables is exported.

@ardumont
Copy link
Contributor Author

I updated the tests scenario to reflect the possibilities.

I do not know what's wrong with the CI though.

@ardumont ardumont force-pushed the create-networking-proxy-function branch from bbfc921 to 3808510 Compare November 24, 2014 23:03

default = lib.mkOption {
type = types.str;
default = "";
Copy link
Member

Choose a reason for hiding this comment

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

We generally use null rather than an empty string to denote an unset value. I.e.

type = types.nullOr types.str;
default = null;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok!

@ardumont
Copy link
Contributor Author

Great!

Thanks for the feedback!
I'll fix this in the evening, right now I cannot :D

Cheers,

@ardumont
Copy link
Contributor Author

Tests output:

VM build log

Expand all | Collapse all

    starting VDE switch for network 1
    - running the VM test script
        + starting all VMs
        + machine: running command: env | grep -i proxy
        + machine: running command: su - alice -c 'env | grep -i proxy'
        + machine: must fail: env | grep -i proxy
        + machine: must fail: su - alice -c 'env | grep -i proxy'
        + machine2: running command: env | grep -i proxy
        + machine2: running command: su - alice -c 'env | grep -i proxy'
        + machine2: must succeed: env | grep -i proxy
        + machine2: must succeed: su - alice -c 'env | grep -i proxy'
        + machine3: running command: env | grep -i proxy
        + machine3: running command: su - alice -c 'env | grep -i proxy'
        + machine3: must succeed: env | grep -i http_proxy | grep 123
        + machine3: must succeed: env | grep -i https_proxy | grep 456
        + machine3: must succeed: env | grep -i rsync_proxy | grep 789
        + machine3: must succeed: env | grep -i ftp_proxy | grep 101112
        + machine3: must succeed: env | grep -i no_proxy | grep 131415
        + machine3: must succeed: su - alice -c 'env | grep -i http_proxy | grep 123'
        + machine3: must succeed: su - alice -c 'env | grep -i https_proxy | grep 456'
        + machine3: must succeed: su - alice -c 'env | grep -i rsync_proxy | grep 789'
        + machine3: must succeed: su - alice -c 'env | grep -i ftp_proxy | grep 101112'
        + machine3: must succeed: su - alice -c 'env | grep -i no_proxy | grep 131415'
        + machine4: running command: env | grep -i proxy
        + machine4: running command: su - alice -c 'env | grep -i proxy'
        + machine4: must succeed: env | grep -i http_proxy | grep 000
        + machine4: must succeed: env | grep -i https_proxy | grep 000
        + machine4: must succeed: env | grep -i rsync_proxy | grep 123
        + machine4: must succeed: env | grep -i ftp_proxy | grep 000
        + machine4: must succeed: env | grep -i no_proxy | grep 131415
        + machine4: must succeed: su - alice -c 'env | grep -i http_proxy | grep 000'
        + machine4: must succeed: su - alice -c 'env | grep -i https_proxy | grep 000'
        + machine4: must succeed: su - alice -c 'env | grep -i rsync_proxy | grep 123'
        + machine4: must succeed: su - alice -c 'env | grep -i ftp_proxy | grep 000'
        + machine4: must succeed: su - alice -c 'env | grep -i no_proxy | grep 131415'
    + collecting coverage data
    + syncing
    + cleaning up

MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* master: (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* commit 'refs/top-bases/experimental/ruby': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…/firebird

* commit 'refs/top-bases/experimental/firebird': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…lover

* commit 'refs/top-bases/experimental/plover': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…honetic

* master: (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
… experimental/php-koellner-phonetic

* commit 'refs/top-bases/experimental/php-koellner-phonetic': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* commit 'refs/top-bases/experimental/nginx': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* commit 'refs/top-bases/experimental/opera': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…ntal/apache-httpd

* commit 'refs/top-bases/experimental/apache-httpd': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* commit 'refs/top-bases/experimental/nix': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* master: (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…blender

* commit 'refs/top-bases/experimental/blender': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…nixos/virtualbox-server

* commit 'refs/top-bases/marc-nixos/virtualbox-server': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…al/cups-1.6-and-1.7

* experimental/gutenprint: (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…rimental/cups-1.6-and-1.7

* commit 'refs/top-bases/experimental/cups-1.6-and-1.7': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...

Conflicts:
	nixos/modules/services/printing/cupsd.nix
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…erimental/parallel-building

* commit 'refs/top-bases/experimental/parallel-building': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* master: (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…eclipse

* commit 'refs/top-bases/experimental/eclipse': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…/inkscape

* commit 'refs/top-bases/experimental/inkscape': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* master: (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…rimental/imap-sync-update

* commit 'refs/top-bases/experimental/imap-sync-update': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* commit 'refs/top-bases/marc-nixos/postfix': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…marc

* experimental/updates: (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...

Conflicts:
	nixos/modules/services/printing/cupsd.nix
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* master: (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* commit 'refs/top-bases/experimental/mingw': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…l/mercurial

* commit 'refs/top-bases/experimental/mercurial': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
…c-nixos/multi-shell-support

* commit 'refs/top-bases/marc-nixos/multi-shell-support': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 10, 2014
* commit 'refs/top-bases/experimental/marc': (206 commits)
  nixos/peerflix: add test to release.nix
  nixos: add peerflix module
  rescuetime: add version
  rescuetime: fix typo
  linux: 3.18.0-rc6 -> 3.18.0-rc7
  nixos/networking: Fix more harmless errors
  rescuetime: a time tracking service
  virtualbox: Fix extension pack installation.
  nodePackages: hack version override sed some more to support github packages, until better solution is found
  rubyLibs: add tmuxinator, update
  deluge: 1.3.7 -> 1.3.10
  munin: 2.0.21 -> 2.0.25
  setuptools: 5.8 -> 7.0
  afl: 0.68b -> 0.79b
  i3: make i3-save-workspace work
  virtualbox: Allow /nix/store being world-writable.
  zeromq: 4.0.4 -> 4.0.5
  nixos/tests: add networking-proxy.nix to release
  Improve readability - from NixOS#5058 (comment)
  Ensure nix-daemon sees the proxy defined options
  ...
@ardumont ardumont deleted the create-networking-proxy-function branch March 7, 2019 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants