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
Conversation
01db43b
to
e7c7ca5
Compare
Hello, Do I need to squash the commits? If anything is wrong, I'll adapt the code accordingly. Cheers, |
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. |
Hello, while working on gnome3-14 for nix, you still have time (and courage :) to answer in other threads, nice!
What do you mean by system-wide?
Right! Thanks |
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. |
Ok. Cool.
Right again! Thanks! |
Nice! That's what I was finding in days. |
@lethalman I called it |
Do you mean Cheers, |
Hah, yeah. Sorry for my english. 2014-11-21 0:16 GMT+03:00 Antoine R. Dumont notifications@github.com:
Sincerely, |
No problem, just making sure I understood you right :D |
26ee55b
to
09c704e
Compare
Commits squashed into 1. |
Looks good to me in principle, maybe @edolstra has a better name for envVarsProxy? |
Hello, does anyone has a better name than |
How about calling them |
Seems good because that takes into account people that may have more specific configuration. Does someone see any other catch? Cheers, |
This location is good. On November 24, 2014 11:49:25 AM "Antoine R. Dumont"
|
Ok. Thanks |
Hello, After following the multiple suggestions, here is the latest description for this PR: Code:
|
I updated the tests scenario to reflect the possibilities. I do not know what's wrong with the CI though. |
bbfc921
to
3808510
Compare
|
||
default = lib.mkOption { | ||
type = types.str; | ||
default = ""; |
There was a problem hiding this comment.
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;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok!
Great! Thanks for the feedback! Cheers, |
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
|
* 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 ...
* 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 ...
…/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 ...
…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 ...
…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 ...
… 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 ...
* 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 ...
* 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 ...
…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 ...
* 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 ...
* 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 ...
…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 ...
…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 ...
…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 ...
…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
…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 ...
* 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 ...
…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 ...
…/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 ...
* 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 ...
…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 ...
* 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 ...
…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
* 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 ...
* 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 ...
…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 ...
…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 ...
* 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 ...
Following the discussion from #5021
Code:
Tests:
Note:
Code rebased to the latest code.
I do not know if it's a good idea.