[Nix-commits] [NixOS/nixpkgs] 7bb59e: virtualbox: Add patch for Linux 4.12
Branch: refs/heads/release-17.03 Home: https://github.com/NixOS/nixpkgs Commit: 7bb59ef88f3c5fc7f959fc90cc614e654f87165d https://github.com/NixOS/nixpkgs/commit/7bb59ef88f3c5fc7f959fc90cc614e654f87165d Author: aszlig <asz...@redmoonstudios.org> Date: 2017-07-04 (Tue, 04 Jul 2017) Changed paths: M pkgs/applications/virtualization/virtualbox/default.nix M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix A pkgs/applications/virtualization/virtualbox/linux-4.12.patch Log Message: --- virtualbox: Add patch for Linux 4.12 Compiling the kernel modules on Linux 4.12 fails, so I've included an upstream patch from: https://www.virtualbox.org/changeset/66927/vbox The patch is applied against the guest additions as well, where we need to transform the patch a bit so that we get CR LF line endings (DOS format), which is what is the case for the guest additions ISO. I've tested this with all the subtests of the "virtualbox" NixOS VM tests and they all succeed on x86_64-linux. Signed-off-by: aszlig <asz...@redmoonstudios.org> (cherry picked from commit 12ee0fbd8883cb5a17b499c42c8d6cdf602d1640) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 12ee0f: virtualbox: Add patch for Linux 4.12
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 12ee0fbd8883cb5a17b499c42c8d6cdf602d1640 https://github.com/NixOS/nixpkgs/commit/12ee0fbd8883cb5a17b499c42c8d6cdf602d1640 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-07-04 (Tue, 04 Jul 2017) Changed paths: M pkgs/applications/virtualization/virtualbox/default.nix M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix A pkgs/applications/virtualization/virtualbox/linux-4.12.patch Log Message: --- virtualbox: Add patch for Linux 4.12 Compiling the kernel modules on Linux 4.12 fails, so I've included an upstream patch from: https://www.virtualbox.org/changeset/66927/vbox The patch is applied against the guest additions as well, where we need to transform the patch a bit so that we get CR LF line endings (DOS format), which is what is the case for the guest additions ISO. I've tested this with all the subtests of the "virtualbox" NixOS VM tests and they all succeed on x86_64-linux. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] d97cdf: nixos/xserver: Document the layouts sed expression
Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: d97cdfc591baf790ce5a9836e1503dfb0eb152e6
https://github.com/NixOS/nixpkgs/commit/d97cdfc591baf790ce5a9836e1503dfb0eb152e6
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-07-03 (Mon, 03 Jul 2017)
Changed paths:
M nixos/modules/services/x11/xserver.nix
Log Message:
---
nixos/xserver: Document the layouts sed expression
This was brought up by @0xABAB in #26984 by the following comment:
https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146405
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 69da1807f02daa776472893741c2f82eca8e838d
https://github.com/NixOS/nixpkgs/commit/69da1807f02daa776472893741c2f82eca8e838d
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-07-03 (Mon, 03 Jul 2017)
Changed paths:
M nixos/modules/services/x11/xserver.nix
Log Message:
---
nixos/xserver: Allow more than one keyboard layout
Regression introduced by 44c64fef16ed566786c8db276085b484c9d233f3.
The services.xserver.layout option allows to specify more than one
layout separated by comma, which the commit above didn't take into
account.
This is very similar to @lheckemann's pull request (#26984) but differs
in the following ways:
* Print out the full list available layouts (as suggested by @0xABAB
in [1]).
* Loop over $layout using the default IFS (and thus no need for
escaping ${cfg.layout}), because the layouts won't contain white
spaces.
* Re-do the error message, which now uses multiple echos instead of a
heredoc, so the line is wrapped according to the viewers terminal
width.
I've tested this with several good and bad layouts and also against the
keymap NixOS VM subtests.
[1]: https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146700
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Fixes: #26961
Closes: #26984
Compare: https://github.com/NixOS/nixpkgs/compare/02ce6963045e...69da1807f02d___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] e82d12: nixos/xserver: Don't use exec in xkb-layouts-exist
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: e82d1262123710b257038c5482a89f6a81ad6e81 https://github.com/NixOS/nixpkgs/commit/e82d1262123710b257038c5482a89f6a81ad6e81 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M nixos/modules/services/x11/xserver.nix Log Message: --- nixos/xserver: Don't use exec in xkb-layouts-exist First of all, thanks to @pbogdan for getting this problem reproduced: https://github.com/NixOS/nixpkgs/commit/2014db3efcd2a#commitcomment-22815396 Also thanks to @vcunat for bringing this to my attention: https://github.com/NixOS/nixpkgs/commit/44c64fef16ed5#commitcomment-22813503 Although it is not entirely clear why Nix has killed the build prior to finishing, it seems to be related to the process substition I was using. So instead of using "exec touch", let's wrap this inside an if so we don't exit too early. Tested this against all sub-tests in nixos/tests/keymap.nix and also a few configurations with wrong keyboard layout definitions. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] bd63da: chromium: Add installation of libGLESv2.so
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: bd63daae03d6a3c014d0b5a526f2698c60f69e6f https://github.com/NixOS/nixpkgs/commit/bd63daae03d6a3c014d0b5a526f2698c60f69e6f Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-25 (Sun, 25 Jun 2017) Changed paths: M pkgs/applications/networking/browsers/chromium/browser.nix Log Message: --- chromium: Add installation of libGLESv2.so The following errors occur when you start Chromium prior to this commit: [2534:2534:0625/202928.673160:ERROR:gl_implementation.cc(246)] Failed to load .../libexec/chromium/swiftshader/libGLESv2.so: ../libexec/chromium/swiftshader/libGLESv2.so: cannot open shared object file: No such file or directory [2534:2534:0625/202928.674434:ERROR:gpu_child_thread.cc(174)] Exiting GPU process due to errors during initialization While in theory we do not strictly need libGLESv2.so, in practice this means that the GPU process isn't starting up at all which in turn leads to crawling rendering performance on some sites. So let's install all shared libraries in swiftshader. I've tested this with the chromium.stable NixOS VM test and also locally on my machine and the errors as well as the performance issues are gone. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixops] 1ab1e6: hetzner: Actually turn XML values into Python type...
Branch: refs/heads/master Home: https://github.com/NixOS/nixops Commit: 1ab1e6cf2555214fc5f1da49da462883cc115766 https://github.com/NixOS/nixops/commit/1ab1e6cf2555214fc5f1da49da462883cc115766 Author: Niklas Hambüchen <m...@nh2.me> Date: 2017-06-20 (Tue, 20 Jun 2017) Changed paths: M nixops/backends/hetzner.py Log Message: --- hetzner: Actually turn XML values into Python types. This worked so far because all used types are strings, but we want this to work in general for all types. Commit: 72f6b81aa9f0e965e2f11fde57beb58cfbf72c9c https://github.com/NixOS/nixops/commit/72f6b81aa9f0e965e2f11fde57beb58cfbf72c9c Author: Niklas Hambüchen <m...@nh2.me> Date: 2017-06-20 (Tue, 20 Jun 2017) Changed paths: M doc/manual/overview.xml M nix/hetzner.nix M nixops/backends/hetzner.py Log Message: --- hetzner: Add `deployment.hetzner.createSubAccount` setting. Fixes #592. This allows using NixOps with pre-existing Hetzner "admin" sub-accounts, which is necessary when 2-factor auth is enabled for the main account. I've also cleaned up the language a bit, making it more clear that "admin account" refers to the sub-account, not to the main account. Commit: d0da0d724411ff5c908a647548940902501096fb https://github.com/NixOS/nixops/commit/d0da0d724411ff5c908a647548940902501096fb Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-24 (Sat, 24 Jun 2017) Changed paths: M doc/manual/overview.xml M nix/hetzner.nix M nixops/backends/hetzner.py Log Message: --- Merge pull request #688 (work around 2FA) This allows to use an existing admin account instead of creating one using the API, so that it's easier if you use 2-factor-authentication on the main robot account. I've tested this change using the hetzner_backend NixOS test and it still succeeds, however the problem is that that test doesn't really test the API, so this might still cause hidden issues on newly installed servers, but from the code changes I feel confident enough that it's highly unlikely. Commit: 6ed1332ab93fa4a7803523cad185da13ed9d8731 https://github.com/NixOS/nixops/commit/6ed1332ab93fa4a7803523cad185da13ed9d8731 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-24 (Sat, 24 Jun 2017) Changed paths: M nixops/backends/hetzner.py Log Message: --- backends/hetzner: Fix Flake8 errors This fixes the following errors: F401 'sys' imported but unused E731 do not assign a lambda expression, use a def E731 do not assign a lambda expression, use a def E501 line too long (86 > 79 characters) E501 line too long (88 > 79 characters) E731 do not assign a lambda expression, use a def F812 list comprehension redefines 'net' from line 532 E501 line too long (83 > 79 characters) E501 line too long (90 > 79 characters) E731 do not assign a lambda expression, use a def I've used NOQA on the log_continue() lambdas, because creating a def just for that would not make it more readable. In addition, I've removed the "Create a new Admin account exclusively for this machine." comment because in the line before we have a log_start() which says pretty much the same. Also, setting robot_user/robot_pass to None at the beginning of _get_robot_user_and_pass() is superfluous, because both if/else statements that follow will set a value in any case. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixops/compare/7ea36691ebec...6ed1332ab93f___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 06271b: krita: Fix build dependencies
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 06271b6eba7ce754a305df1d90925de976b915d2 https://github.com/NixOS/nixpkgs/commit/06271b6eba7ce754a305df1d90925de976b915d2 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-23 (Fri, 23 Jun 2017) Changed paths: M pkgs/applications/graphics/krita/default.nix M pkgs/top-level/all-packages.nix Log Message: --- krita: Fix build dependencies First of all, we need a newer version of Vc, because at least version 1.1.0 is required for Krita 3.1.3. Also, qtmultimedia and qtx11extras were missing. Built and tested successfully on my machine. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @abbradar ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] fa6fd3: github/pr-template: Add note about NixOS tests
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: fa6fd34fcca07c0762ef3bc44962e2dc49937454 https://github.com/NixOS/nixpkgs/commit/fa6fd34fcca07c0762ef3bc44962e2dc49937454 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-23 (Fri, 23 Jun 2017) Changed paths: M .github/PULL_REQUEST_TEMPLATE.md Log Message: --- github/pr-template: Add note about NixOS tests On several occasions I've seen people bumping packages which have NixOS tests but without actually running them. While this probably won't prevent such occasions entirely, at least it serves as an additional checklist item so contributors don't forget about these tests. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 63fb845fcf6ea02db7933f503948a01fb2f6c2a4 https://github.com/NixOS/nixpkgs/commit/63fb845fcf6ea02db7933f503948a01fb2f6c2a4 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-23 (Fri, 23 Jun 2017) Changed paths: M pkgs/applications/virtualization/virtualbox/hardened.patch Log Message: --- virtualbox: Rebase hardened.patch on top of 5.1.22 The merge of the version bump in 6fb9f892382b4b091fc9edcae00e2eb4c0729bda didn't take care of our patch for the hardening mode and thus enabling VirtualBox without also force-disabling hardening mode will result in a build error. While the patch is largely identical with the old version, I've removed one particular change around the following code: if (pFsObjState->Stat.st_mode & S_IWOTH) return supR3HardenedSetError3(VERR_SUPLIB_WORLD_WRITABLE, pErrInfo, "World writable: '", pszPath, "'"); In the old version of the patch we have checked whether the path is within the Nix store and suppressed the error return if that's the case. The reason why I did that in the first place was because we had a bunch of symlinks which were writable. In VirtualBox 5.1.22 the code specifically checks whether the file is a symlink, so we can safely drop our change. Tested via all of the "virtualbox" NixOS VM subtests and they now all succeed. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/6fb9f892382b...63fb845fcf6e___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 1f6518: electrum: Unify protobuf dependencies
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 1f65182272800122917f5ad25479ac618f7fd100 https://github.com/NixOS/nixpkgs/commit/1f65182272800122917f5ad25479ac618f7fd100 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-22 (Thu, 22 Jun 2017) Changed paths: M pkgs/applications/misc/electrum/default.nix M pkgs/development/python-modules/keepkey/default.nix Log Message: --- electrum: Unify protobuf dependencies Since 9c57f3b5c05621f0d1c207aa80f20ccc1d79ebfb bumped the protobuf version because the new upstream requires it, electrum now gets protobuf3_0 *and* protobuf3_2 instead of just one version. This leads to the following build errer: Found duplicated packages in closure for dependency 'protobuf': protobuf 3.0.2 (...-python2.7-protobuf-3.0.2/lib/python2.7/site-packages) protobuf 3.2.0 (...-python2.7-protobuf-3.2.0/lib/python2.7/site-packages) Using protobuf3_2 for keepkey and electrum fixes the build. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @np ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 9c57f3: python-modules/trezor: Fix build
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 9c57f3b5c05621f0d1c207aa80f20ccc1d79ebfb https://github.com/NixOS/nixpkgs/commit/9c57f3b5c05621f0d1c207aa80f20ccc1d79ebfb Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-22 (Thu, 22 Jun 2017) Changed paths: M pkgs/development/python-modules/trezor/default.nix Log Message: --- python-modules/trezor: Fix build Regression introduced by 76beb0831384b5ae53592513507524990017e973. With version 0.7.15 a few additional dependencies are needed by trezor, mainly a newer version of protobuf bindings and requests. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @np ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] bcaf2f: nixos/tests/sddm: Fix detecting login screen
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: bcaf2f6dbe5369f4835cfff31639f07b70bcb670 https://github.com/NixOS/nixpkgs/commit/bcaf2f6dbe5369f4835cfff31639f07b70bcb670 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-22 (Thu, 22 Jun 2017) Changed paths: M nixos/tests/sddm.nix Log Message: --- nixos/tests/sddm: Fix detecting login screen Tesseract seems to have a hard time detecting the "ALICE FOOBAR" text, so let's match on "Select your user and enter password" instead. Ran the test on x86_64-linux and it now succeeds. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 4007ee: vlock: Don't try to install setuid binary
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 4007ee974c68a65444d939312ffe308297bdd3f6 https://github.com/NixOS/nixpkgs/commit/4007ee974c68a65444d939312ffe308297bdd3f6 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-22 (Thu, 22 Jun 2017) Changed paths: M pkgs/misc/screensavers/vlock/default.nix Log Message: --- vlock: Don't try to install setuid binary With newer Nix it's (fortunately) no longer possible to create a file with setuid bits, even though the permissions are fixed later the build will fail during installPhase already. I've verified whether the contents of the output path are the same as before this change and the contents match. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 44c64f: nixos/xserver: Improve checking keyboard layout
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 44c64fef16ed566786c8db276085b484c9d233f3 https://github.com/NixOS/nixpkgs/commit/44c64fef16ed566786c8db276085b484c9d233f3 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-22 (Thu, 22 Jun 2017) Changed paths: M nixos/modules/services/x11/xserver.nix Log Message: --- nixos/xserver: Improve checking keyboard layout Enumerating the symbols directory doesn't include variants, so we're now basically doing what "localectl list-x11-keymap-layouts" does but we use sed instead. The reason I'm not using localectl directly is because the path to rules/base.lst is hardcoded in the systemd source. Of course, the XKB specification allows for much more complicated rules, but at least this should cover the most basic ones including variants. So the sed expression itself is just for listing the available layouts and variants and we use a grep with -xF to match only full lines without interpreting regular expressions. This should again allow to set "dvorak" as the layout option. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @lheckemann Fixes: #25526 Commit: 7a99036cef70dd00cc8a4a5be04ea4a25ab0dca4 https://github.com/NixOS/nixpkgs/commit/7a99036cef70dd00cc8a4a5be04ea4a25ab0dca4 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-22 (Thu, 22 Jun 2017) Changed paths: M nixos/release-combined.nix Log Message: --- nixos/release-combined: Add keymap tests We really want to break channel updates whenever we break something like this, because this actually will hit machines out there and can be very much annoying (we had broken keymaps a few times which is why I introduced these tests in the first place). Just to be sure I don't break channel updates with this commit, I ran all of the keymap tests and they all succeeded. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/7c0f6f4be534...7a99036cef70___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 7c0f6f: pyopenssl: 16.2.0 -> 17.0.0 and fix tests
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 7c0f6f4be53453e08a1d4a27cd40a46c4e920ce8 https://github.com/NixOS/nixpkgs/commit/7c0f6f4be53453e08a1d4a27cd40a46c4e920ce8 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-06-22 (Thu, 22 Jun 2017) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- pyopenssl: 16.2.0 -> 17.0.0 and fix tests Upstream changes: * Added OpenSSL.X509Store.set_time() to set a custom verification time when verifying certificate chains. pyca/pyopenssl#567 * Added a collection of functions for working with OCSP stapling. None of these functions make it possible to validate OCSP assertions, only to staple them into the handshake and to retrieve the stapled assertion if provided. Users will need to write their own code to handle OCSP assertions. We specifically added: Context.set_ocsp_server_callback, Context.set_ocsp_client_callback, and Connection.request_ocsp. pyca/pyopenssl#580 * Changed the SSL module's memory allocation policy to avoid zeroing memory it allocates when unnecessary. This reduces CPU usage and memory allocation time by an amount proportional to the size of the allocation. For applications that process a lot of TLS data or that use very lage allocations this can provide considerable performance improvements. pyca/pyopenssl#578 * Automatically set SSL_CTX_set_ecdh_auto() on OpenSSL.SSL.Context. pyca/pyopenssl#575 * Fix empty exceptions from OpenSSL.crypto.load_privatekey(). pyca/pyopenssl#581 The full upstream changelog can be found at: https://pyopenssl.readthedocs.io/en/17.0.0/changelog.html I've also added a patch from pyca/pyopenssl#637 in order to fix the tests, which was the main reason for the version bump because that patch won't apply for 16.2.0. According to the upstream changelog there should be no backwards-incompatible changes, but I've tested building against some of the packages depending on pyopenssl anyway. Regardless of this, the build for pyopenssl fails right now anyway, so the worst that could happen via this commit would be that we break something that's already broken. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 7e10ec: chromium: Allow to put extensions in system path
Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 7e10ecb763a1a6ce1de15066bcbfb04ab0c2dda1
https://github.com/NixOS/nixpkgs/commit/7e10ecb763a1a6ce1de15066bcbfb04ab0c2dda1
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-06-18 (Sun, 18 Jun 2017)
Changed paths:
M pkgs/applications/networking/browsers/chromium/common.nix
Log Message:
---
chromium: Allow to put extensions in system path
This should allow us to easily add system-wide Chromium extensions via a
NixOS configuration similar to this:
{ pkgs, ... }: {
environment.pathsToLink = [ "/share/chromium/extensions" ];
environment.systemPackages = [ pkgs.my-shiny-extension ];
}
For more details about what Chromium expects within that directory, see:
https://developer.chrome.com/extensions/external_extensions
I've introduced this because of a personal desire to gain more control
about which extensions are installed and what they are able to do. All
of the extensions I use are free software, but despite that it's useful
to either easily patch them and also prevent unwanted automatic updates.
Tested this using the NixOS "chromium.stable" test on x86_64-linux.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @offlinehacker because of #21050
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] bb6a5b: nixos/xserver: Changed xrandrHeads to support corr...
Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: bb6a5b079fe8c88a6e42c92179711b2d0a9a9842
https://github.com/NixOS/nixpkgs/commit/bb6a5b079fe8c88a6e42c92179711b2d0a9a9842
Author: Roger Qiu <roger@polycademy.com>
Date: 2017-04-21 (Fri, 21 Apr 2017)
Changed paths:
M nixos/doc/manual/release-notes/rl-1709.xml
M nixos/modules/services/x11/xserver.nix
Log Message:
---
nixos/xserver: Changed xrandrHeads to support corresponding monitor section
configuration in Xorg
Commit: 8266c89b55e3ae97ff635a0f9f8aee556ae7b384
https://github.com/NixOS/nixpkgs/commit/8266c89b55e3ae97ff635a0f9f8aee556ae7b384
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M nixos/modules/services/x11/xserver.nix
Log Message:
---
nixos/xserver: Fix up/refactor xrandrHeads option
Using invalid module options in the submodule isn't very nice, because
it doesn't give very useful errors in case of type mismatch, also we
don't get descriptions of these options as they're effecively
nonexistent to the module system. Another downside of this is that
merging of these options isn't done correctly as well (eg. for
types.lines).
So we now have proper submodules for each xrandrHead and we also use
corcedTo in the type of xrandrHeads so that we can populate the
submodule's "output" option in case a plain string is defined for a list
item.
Instead of silently skipping multiple primary heads, we now have an
assertion, which displays a message and aborts configuration evaluation
appropriately.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: d7a8876c13f75e7a55e2f3cbc16346406e9abdf8
https://github.com/NixOS/nixpkgs/commit/d7a8876c13f75e7a55e2f3cbc16346406e9abdf8
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M nixos/doc/manual/release-notes/rl-1709.xml
Log Message:
---
nixos/doc: Improve release notes for xrandrHeads
The xrandrHeads option has been there since a long time, so there is no
need to advertise it as a new feature.
Instead, let's focus on just what has changed, which is that we now
assign one head to be primary.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 79e712822fcfe797c545e2db5bcef9a07b00b2e5
https://github.com/NixOS/nixpkgs/commit/79e712822fcfe797c545e2db5bcef9a07b00b2e5
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M nixos/modules/services/x11/xserver.nix
Log Message:
---
nixos/xserver: Document xrandrHeads.apply
It was asked by @CMCDragonkai to elaborate on that, so let's just do
this by actually providing a code comment.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 9dca737d6269759745c9e68ea462446cde4d9be9
https://github.com/NixOS/nixpkgs/commit/9dca737d6269759745c9e68ea462446cde4d9be9
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-05-02 (Tue, 02 May 2017)
Changed paths:
M nixos/doc/manual/release-notes/rl-1709.xml
M nixos/modules/services/x11/xserver.nix
Log Message:
---
Merge pull request #15353 (improve xrandrHeads)
When you have a setup consisting of multiple monitors, the default is
that the first monitor detected by xrandr is set to the primary monitor.
However this may not be the monitor you need to be set as primary. In
fact this monitor set to primary may in fact be disconnected.
This has happened for the original submitter of the pull request and it
affected these programs:
* XMonad: Gets confused with Super + {w,e,r}
* SDDM: Puts the login screen on the wrong monitor, and does not
currently duplicate the login screen on all monitors
* XMobar: Puts the XMobar on the wrong monitor, as it only puts the
taskbar on the primary monitor
These changes should fix that not only by setting a primary monitor in
xrandrHeads but also make it possible to make a different monitor the
primary one.
The changes are also backwards-compatible.
Compare: https://github.com/NixOS/nixpkgs/compare/beff1984f4c8...9dca737d6269___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 72f2b5: nixos/grub: Add another example for extraEntries
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 72f2b506c73acbdfc15a076acefc793486d9683e https://github.com/NixOS/nixpkgs/commit/72f2b506c73acbdfc15a076acefc793486d9683e Author: aszlig <asz...@redmoonstudios.org> Date: 2017-04-25 (Tue, 25 Apr 2017) Changed paths: M nixos/modules/system/boot/loader/grub/grub.nix Log Message: --- nixos/grub: Add another example for extraEntries Someone on IRC wanted to boot Fedora from another disk. While I'm not too familiar with UEFI booting in conjunction with GRUB2 it took some time to get it to work. So in order to safe others from frustration I'm adding this as another example to the extraEntries option. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] packaging windows applications through wine
On Mon, Apr 24, 2017 at 02:39:02AM +, Taeer Bar-Yam wrote:
> When one installs things through wine, one usually has to click
> through a bunch of agreements for things installed via winetricks. Can
> we bypass this so we can make nix packages for these things that
> installs nicely?
That really depnds on the installer:
* If it's an MSI file, you may be able to automate this using msiexec.
* Some installers can be extracted via cabextract, unshield, 7zip, etc...
* You could override specific functionality via WINEDLLOVERRIDES, but
that might be a bit difficult in a GUI application.
* Automate it via something like xdotool in an Xvfb.
I guess the simplest method would be the latter, because if you extract
the installer archive there might be some missing files or registry keys
that you need to apply as well.
Here is an example for automating this via xdotool:
https://github.com/openlab-aux/vuizvui/blob/97e440e996e9c418e46af3dbcdba58595b5c11ea/pkgs/aszlig/santander/default.nix#L63-L74
In this case the installer is quite simple because all you need to do is
click "Next -> Next -> Next -> ..." here.
If it's something more complicated, like if you need ta accept an EULA,
then you might be either in luck and you just need to apply something
like "key alt+a Return" all over again if for example alt+a is for
"accept EULA".
In most cases however it isn't that easy, so I'd try to look whether you
can get information about what's displayed via tracing the font
rendering calls in wine. Another way would be to use OCR, but that is
slower and might be a bit error prone.
> The other challenge I see is where do you put the wineprefix? Because
> on the one hand you want the installation to happen at system build
> time, so that would suggest the nix store. But you also want the
> application to be able to write files (like saves ) so that would
> have to be in your home folder.
You could set the user data directory to some other unix path via
dosdevices/ and change %APPDATA% accordingly, like:
https://support.microsoft.com/en-us/help/190234/prb-how-to-modify-the-personal-directory-for-all-new-users
Another way would be to use a wrapper that uses overlayfs to write all
the differences of the immutable store path to some location within the
home directory (like eg. ${XDG_DATA_HOME:-$HOME/.local/share}/your_app).
> Is how to package wine applications a solved problem, or do I need to
> do some creative work?
The latter :-)
a!
--
aszlig
Universal dilettante
signature.asc
Description: Digital signature
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] [NixOS/nixpkgs] f84b81: wine-staging: Fix SHA256 hash
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: f84b8178aa2f9b03c42d6ddc3379b7f5adb65b02 https://github.com/NixOS/nixpkgs/commit/f84b8178aa2f9b03c42d6ddc3379b7f5adb65b02 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-04-23 (Sun, 23 Apr 2017) Changed paths: M pkgs/misc/emulators/wine/sources.nix Log Message: --- wine-staging: Fix SHA256 hash In c6b3c66277ff97d77d51c3a822458f19982b922a, the unstable version has been bumped to 2.6. Unfortunately the staging source is re-using the version attribute from the unstable source and thus has been bumped as well. I have built wineStaging on x86_64-linux and it now succeeds. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @FRidh ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 83e140: nixos/slim: Implement logging to journal
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 83e1400e0ce762a9932041977e3c9b90f049425b https://github.com/NixOS/nixpkgs/commit/83e1400e0ce762a9932041977e3c9b90f049425b Author: aszlig <asz...@redmoonstudios.org> Date: 2017-04-23 (Sun, 23 Apr 2017) Changed paths: M nixos/modules/services/x11/display-managers/slim.nix M pkgs/applications/display-managers/slim/default.nix A pkgs/applications/display-managers/slim/no-logfile.patch Log Message: --- nixos/slim: Implement logging to journal The main change here is a patch of SLiM to tread a log file of /dev/stderr specially in that it now uses std::cerr instead of a file for logging. This allows us to set the logfile to stderr in NixOS for the generated SLiM configuration file and we now get logging to the systemd journal. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: dc87b5587e3fb39e96e6b965a26f324daf7508f8 https://github.com/NixOS/nixpkgs/commit/dc87b5587e3fb39e96e6b965a26f324daf7508f8 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-04-23 (Sun, 23 Apr 2017) Changed paths: M nixos/release-combined.nix M nixos/release.nix A nixos/tests/slim.nix Log Message: --- nixos: Add a VM test for the SLiM display manager This is currently our default display manager, so I'm adding this to the "tested" job as well to ensure we don't ship broken revisions where X is most likely not working. The test uses a custom SLiM theme that's specifically tailored for good OCR results (mainly white background and black fonts without anything else), because our default NixOS theme has a very small contrast between background and fonts in some places. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/dcc61da97c72...dc87b5587e3f___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] e662e0: nixos/systemd-boot-builder: Don't write .pyc files
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: e662e035f9ed4d125c7534bc65e01fc73a0b0f62 https://github.com/NixOS/nixpkgs/commit/e662e035f9ed4d125c7534bc65e01fc73a0b0f62 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-04-20 (Thu, 20 Apr 2017) Changed paths: M nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py Log Message: --- nixos/systemd-boot-builder: Don't write .pyc files This has surfaced since d990aa716327abb018e8352dcf7ba2fcfb4fc34c. The "simpleUefiGummiboot" installer test fails since this commit, because that commit introduced a small check to verify whether the store was altered. While installing NixOS for the first time, the store is usually in /mnt/nix/store and without the read-only bind mount that's preventing programs from altering the store. So after nixos-install is done creating the system closure and setting it as the active system profile, the bootloader is written from the closure inside the chroot. The systemd-boot-builder is invoked during this step, which adds .pyc files for various Python modules of the Python 3 store path, which in turn invalidates the hash of the Python 3 store path itself. At the time the system is booted up again, the nix-store is verified and fails with something like this: path /nix/store/zvm545rqc4d97caqq9h7344bnd06jhzb-python3-3.5.3 was modified! expected hash b2c975f4b8d197443fbb09690fb3f6545e165dd44c9309d7d6df2fce0579ebeb, got bccca19f39c9d26d857ccf1fb72818b2b817967e6d497a25a1283e36ed0acf01 Running the interpreter with the -B argument prevents Python from writing those byte code files: https://docs.python.org/3/using/cmdline.html#cmdoption-B Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] b01793: vlc: Fix build for Qt >= 5.7.0
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: b0179351036a870da8c1a89c991a359a73aab0e2 https://github.com/NixOS/nixpkgs/commit/b0179351036a870da8c1a89c991a359a73aab0e2 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-04-19 (Wed, 19 Apr 2017) Changed paths: M pkgs/applications/video/vlc/default.nix M pkgs/top-level/all-packages.nix Log Message: --- vlc: Fix build for Qt >= 5.7.0 This basically does something similar than the AUR build: https://aur.archlinux.org/packages/vlc-qt5/ On our side, all there is to do is to force compiling using C++11 mode and use a patch that the AUR package took from the following upstream patchwork URL: https://patches.videolan.org/patch/14061/ Instead of passing CXXFLAGS to the configure script, I'm using sed here to make sure we don't override flags figured out by configure. For example if ./configure is used with CXXFLAGS=-std=c++11 appended or prepended, we have something like: ... -I../include -std=c++11 -Wall -Wextra -Wsign-compare ... While if we don't do that at all, we have something like: ... -I../include -g -O2 -Wall -Wextra -Wsign-compare ... Another way would be to use NIX_CFLAGS_COMPILE, but that would affect even compilation of C code and thus resulting in a bunch of warnings like this: cc1: warning: command line option '-std=c++11' is valid for C++/ObjC++ but not for C So with our approach the flags during build look much better: ... -I../include -std=c++11 -g -O2 -Wall -Wextra -Wsign-compare ... Another thing I've changed is that the vlc_qt5 attribute in all-packages.nix now uses the latest Qt 5 version, because the build for Qt >= 5.7.0 is now no longer broken. I've also ordered the preConfigure attribute before the configureFlags attribute, because it makes more sense in terms of context (pre -> configure -> post). Tested by building on x86_64-linux with libsForQt56.vlc, libsForQt58.vlc and vlc (the Qt 4 version, just to be sure I didn't accidentally break it). Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @ttuegel ___ nix-commits mailing list nix-comm...@lists.science.uu.nl https://mailman.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 288a79: tesseract: Reintroduce enableLanguages
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 288a79187cdb6e92c8354b3e06cebbdc8ad65d4a https://github.com/NixOS/nixpkgs/commit/288a79187cdb6e92c8354b3e06cebbdc8ad65d4a Author: aszlig <asz...@redmoonstudios.org> Date: 2017-04-11 (Tue, 11 Apr 2017) Changed paths: M nixos/lib/testing.nix M pkgs/applications/graphics/tesseract/default.nix Log Message: --- tesseract: Reintroduce enableLanguages I've removed that attribute in 68bc260ca2d71a676dd6afdb3524d4fff483016b, because the language files no longer were distributed as seperate files, but if we for example only want to use the English training data, the closure size of Tesseract gets quite large (around 1.2 GB), which is a bit much just to be able to run NixOS VM tests. For this reason I've also switched the VM tests back to using only the English language. Tested using the following VM tests (the ones that have OCR enabled) on x86_64-linux: * nixos/tests/chromium.nix -A stable * nixos/tests/emacs-daemon.nix * nixos/tests/installer.nix -A luksroot * nixos/tests/lightdm.nix * nixos/tests/plasma5.nix * nixos/tests/sddm.nix Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 42bb63f803c5f8e84a4ff7c86c9be37c8264f409 https://github.com/NixOS/nixpkgs/commit/42bb63f803c5f8e84a4ff7c86c9be37c8264f409 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-04-11 (Tue, 11 Apr 2017) Changed paths: M pkgs/development/libraries/leptonica/default.nix M pkgs/top-level/all-packages.nix Log Message: --- leptonica: 1.72 -> 1.74.1 The changes are a bit too big to include it here in the commit message, so if you want the details of what changed, please visit this URL: http://leptonica.org/source/version-notes.html I have also provided openjpeg, giflib and libwebp as dependencies so that Leptonica is able to read/write those file formats. Additionally I've added a patch that uses pkgconfig to resolve all dependencies (except giflib), because unlike AC_CHECK_LIB() the PKG_CHECK_MODULES() macro defines *_LIBS variables to include the linker search path. Unfortunately that patch alone is not enough, because the *_LIBS variable are substituted by the upstream configure.ac to *not* include the linker search paths, so we need to remove the AC_SUBST() calls within PKG_CHECK_MODULES(). The only dependency that's not yet using PKG_CHECK_MODULES() is giflib, because giflib doesn't have a pkg-config description file, therefore we're using substituteInPlace to insert the linker search path after the lept.pc file was generated by configure. Another thing that we no longer need is the dependency on libpng version 1.2, because Leptonica now also works with more recent libpng versions. Tested by building the package itself and also the following packages that immediately depend on leptonica: * k2pdfopt * tesseract * jbig2enc All of these packages succeeded to build on x86_64-linux. The main reason why I'm bumping Leptonica to version 1.74.1 is that we need at least version 1.74 to bump Tesseract to the latest upstream version. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: c381fa9b632ede763729a6df39565f27b9e0b4b3 https://github.com/NixOS/nixpkgs/commit/c381fa9b632ede763729a6df39565f27b9e0b4b3 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-04-11 (Tue, 11 Apr 2017) Changed paths: M pkgs/applications/graphics/tesseract/default.nix Log Message: --- tesseract: 3.04.01 -> 3.05.00 Upstream changelog: * Made some fine tuning to the hOCR output. * Added TSV as another optional output format. * Fixed ABI break introduced in 3.04.00 with the AnalyseLayout() method. * text2image tool - Enable all OpenType ligatures available in a font. This feature requires Pango 1.38 or newer. * Training tools - Replaced asserts with tprintf() and exit(1). * Fixed Cygwin compatibility. * Improved multipage tiff processing. * Improved the embedded pdf font (pdf.ttf). * Enable selection of OCR engine mode from command line. * Changed tesseract command line parameter '-psm' to '--psm'. * Added new C API for orientation and script detection, removed the old one. * Increased minimum autoconf version to 2.59. * Removed dead code. * Fixed many compiler warning. * Fixed memory and resource leaks. * Fixed some issues with the 'Cube' OCR engine. * Fixed some openCL issues. * Added option to build Tesseract with CMake build system. * Implemented CPPAN support for easy Windows building. The upstream URL of the change log is: https://github.com/tesseract-ocr/tesseract/releases/tag/3.05.00 Tested by building against the following packages that directly depend on it: * vapoursynth (with ocrSupport = true) * pyocr (fails) * vobsub2srt Also tested against the following NixOS VM tests that have OCR enabled: * nixos/tests/chromium.nix -A stable * nixos/t
[Nix-commits] [NixOS/nixpkgs] 0a7673: qemu_test: Rebase force-uid0-on-9p.patch
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 0a7673d2029ef69175b8e3ce41677965edde371b https://github.com/NixOS/nixpkgs/commit/0a7673d2029ef69175b8e3ce41677965edde371b Author: aszlig <asz...@redmoonstudios.org> Date: 2017-03-11 (Sat, 11 Mar 2017) Changed paths: M pkgs/applications/virtualization/qemu/default.nix M pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch Log Message: --- qemu_test: Rebase force-uid0-on-9p.patch This reverts commit 3a4e2376e444fd7664102af00a34c65b47e271ec. The reverted commit caused the fix for CVE-2016-9602 not to be applied for qemu_test because it conflicts with the force-uid0-on-9p.patch. So with the rebase of the patch on top of the changes of the CVE-2016-9602.patch, both patches no longer conflict with each other. I've tested this with the "misc" NixOS test and it succeeds. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 1de5f1: aqbanking/updater: Switch to HTTPS URL
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 1de5f1bbeb403f8477b0651e1c9d1445b8ba8da3 https://github.com/NixOS/nixpkgs/commit/1de5f1bbeb403f8477b0651e1c9d1445b8ba8da3 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-03-11 (Sat, 11 Mar 2017) Changed paths: M pkgs/development/libraries/aqbanking/update.sh Log Message: --- aqbanking/updater: Switch to HTTPS URL The site has changed to HTTPS and no longer serves HTTP (yay). Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 460c064852aa368c53b168a5f09d5b4e78d42caf https://github.com/NixOS/nixpkgs/commit/460c064852aa368c53b168a5f09d5b4e78d42caf Author: aszlig <asz...@redmoonstudios.org> Date: 2017-03-11 (Sat, 11 Mar 2017) Changed paths: M pkgs/development/libraries/aqbanking/sources.nix Log Message: --- aqbanking: 5.6.10 -> 5.6.12 * 5.6.11: Fix problem with some servers aborting SSL connections. * 5.6.12: Improve handling of offset accounts during turnover retrieval. The full changelogs in German can be found at: https://www.aquamaniac.de/sites/news/index.php Built and tested successfully on my machine. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: e25f8f2e37ab0cb042220939cd9a2360e4851594 https://github.com/NixOS/nixpkgs/commit/e25f8f2e37ab0cb042220939cd9a2360e4851594 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-03-11 (Sat, 11 Mar 2017) Changed paths: M pkgs/development/libraries/aqbanking/sources.nix Log Message: --- gwenhywfar: 4.15.3 -> 4.17.0 * 4.17.0: A few smaller fixes. * 4.16.0beta: It's now possible to show saved passwords from the GWEN_PASSWD_STORE file. * 4.15.6beta: Improve Certificate handling with TLS connections. * 4.15.5beta: Fix problem with some servers aborting SSL connections. The full changelogs in German can be found at: https://www.aquamaniac.de/sites/news/index.php Built and tested successfully on my machine. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/92b3b9bb3f58...e25f8f2e37ab___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixops] 4bbceb: nix/ssh-tunnel: Don't set addrgenmode to none
Branch: refs/heads/master Home: https://github.com/NixOS/nixops Commit: 4bbceb294fc50146a4fd47352fba786ee1af6654 https://github.com/NixOS/nixops/commit/4bbceb294fc50146a4fd47352fba786ee1af6654 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M nix/ssh-tunnel.nix Log Message: --- nix/ssh-tunnel: Don't set addrgenmode to none This partially reverts 9b382b10d7d861f1dfc9ce88db7bd80d54b7553b. It turns out that torvalds/linux@cc9da6cc4f56e05cc9e591459fe0192727ff58b3 itself isn't the real issue, but just caused the real bug to surface. After hours of debugging together with Hannes Frederic Sowa, we finally found what's the culprit here, so the commit I'm partially reverting is merely a workaround which doesn't fix anything but just causes the bug to show up less frequently. As for the issue itself: OpenSSH polls the file descriptors of the tun devices and as soon as poll returns the descriptor as being writeable, the data coming from the SSH stream is written to the tun device. In this particular case the mentioned kernel commit causes router solicitations to be sent to the tun device, which in theory shouldn't be a problem either. However, if one tun device is up earlier than the counterpart, these solicitation packets are sent to the tun device and get forwarded over the SSH connection to the other peer, which then tries to write these packets into the tun device and fails because the interface is down. Let's illustrate this so it becomes clear: _ .-. Channel A ___( )()___ Channel B .--. | SSH Client | > (__ Internet ___) > | SSH Server | | /|\ | ()() | | | | | | | \|/ | | Tun A (UP) | | Tun B (DOWN) | `-' `--' So we have tunnel device A here which is already up while the tunnel device B isn't yet. Tun A now gets a router solicitation packed which the SSH client sends over to the SSH server over Channel A and B. The SSH server writes the packet into Tun B, but it is down, so the write() fails with errno EIO (Input/output error) and that in turn causes the SSH server to shut down its channel, resulting in follow-up traffic to end up in the middle of nowhere. While trying to write a patch for OpenSSH to either avoid writing to the tun device when it's down or ignore EIO, I figured out that this really is a kernel bug and also a very longlasting one. Since torvalds/linux@1bd4978a88ac2589f3105f599b1d404a312fb7f6 the following code is at the start of tun_get_user(), which is called when user space tries to write() to the device: if (!(tun->dev->flags & IFF_UP)) return -EIO; Unfortunately tun_chr_poll() doesn't take this into account and designate the device as being writeable even if it's not UP, so the real fix here should indicate the file descriptor being able to write when it's really up. As an analogy, it's a bit like this: tun_chr_poll(): "Hey, you can write to the FD, go on :-)" openssh: write(...); tun_get_user(): "Haha, I lied, you can't!" In summary: Setting addrgenmode to none isn't addressing this at all and it only worked in my tests because the addrgenmode has been set quickly enough to not cause router solicitations to be sent. It's also a kernel problem, so it's not the resonsibility of NixOps to work around or try to fix it. The reason I'm only doing a partial revert is that using iproute2 instead of nettools makes the Nix expression more readable and along switching to iproute2 I've also chained the commands via && to catch failures instead of ignoring them. I also did more comprehensive tests during the last few days and I could confirm that the workaround didn't prevent the bug from happening at all but only caused it to be less frequent. Here is a VM test I wrote to confirm this: https://gist.github.com/aszlig/5e8c8462d17f787b7f171c34090fd590 So if all goes well, the real fix should land with the upcoming stable kernel updates. Thanks again to Hannes for help on debugging this properly plus getting this fixed soon in the kernel (I did a first patch, but that one wasn't sufficient enough and he's obviously the expert in this matter). Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 4daccf: systemd-boot: Make sure /etc/machine-id exists
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 4daccf208feccb027731d3fc8dc2686ab9ef3428 https://github.com/NixOS/nixpkgs/commit/4daccf208feccb027731d3fc8dc2686ab9ef3428 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-20 (Mon, 20 Feb 2017) Changed paths: M nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py Log Message: --- systemd-boot: Make sure /etc/machine-id exists This leads to the following error when trying to install a new machine where the machine ID wasn't yet initialized during boot: Failed to get machine did: No such file or directory In addition this was also detected by the simpleUefiGummiboot installer test. So let's generate a fallback machine ID by using systemd-machine-id-setup before actually running bootctl. Tested this by running the installer.simpleUefiGummiboot test, it still fails but not because of the machine ID. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @edolstra, @shlevy, @mic92 Fixes: #22561 Commit: dc31a1ea29cae217b71134bf59f888c5a90f630b https://github.com/NixOS/nixpkgs/commit/dc31a1ea29cae217b71134bf59f888c5a90f630b Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-20 (Mon, 20 Feb 2017) Changed paths: M nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py Log Message: --- systemd-boot: Unlink loader.conf if it exists Since systemd version 232 the install subcommand of bootctl opens the loader.conf with fopen() modes "wxe", where the "e" stands for exclusive, so the call will fail if the file exists. For installing the boot loader just once this is fine, but if we're using NIXOS_INSTALL_BOOTLOADER on a systemd where the bootloader is already present this will fail. Exactly this is done within the simpleUefiGummiboot installer test, where nixos-install is called twice and thus the bootloader is also installed twice, resulting in an error during the fopen call: Failed to open loader.conf for writing: File exists Removing the file prior to calling bootctl should fix this. I've tested this using the installer.simpleUefiGummiboot test and it now succeeds. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @edolstra, @shlevy, @mic92 Fixes: #22925 Compare: https://github.com/NixOS/nixpkgs/compare/2c4d9c922868...dc31a1ea29ca___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 7c9f4e: lua-packages/luasocket: Fix wrong platforms value
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 7c9f4ee0325d3d1902d8123a6708a449c2fa3eac https://github.com/NixOS/nixpkgs/commit/7c9f4ee0325d3d1902d8123a6708a449c2fa3eac Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-20 (Mon, 20 Feb 2017) Changed paths: M pkgs/top-level/lua-packages.nix Log Message: --- lua-packages/luasocket: Fix wrong platforms value This has surfaced due to 505d7bea3af48c79af4212111324a4b95f80f212 and the fixup commit 77f5a50c400d7e312e7491593dcc8ee8cab86c2c. The individial platform attributes are a list rather than single elements, so in this case we got: with platforms; [darwin linux freebsd illumos] Which results in: [ ["x86_64-darwin"] ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux"] ["i686-freebsd" "x86_64-freebsd"] ["x86_64-solaris"] ] So if you don't have allowBroken set in nixpkgs config, you end up with an evaluation error because meta.platforms is expected to be a list instead of a list of lists which we got here. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @mornfall, @vcunat ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 86ff21: paperwork: fix locale path
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 86ff21af165c23bebf877623e0db65713f93a708 https://github.com/NixOS/nixpkgs/commit/86ff21af165c23bebf877623e0db65713f93a708 Author: Symphorien Gibol <symphorien+...@xlumurb.eu> Date: 2017-02-08 (Wed, 08 Feb 2017) Changed paths: M pkgs/applications/office/paperwork/default.nix Log Message: --- paperwork: fix locale path Commit: 6d6cf3f24acce7ef4dc541c797ad23e70889883b https://github.com/NixOS/nixpkgs/commit/6d6cf3f24acce7ef4dc541c797ad23e70889883b Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-19 (Sun, 19 Feb 2017) Changed paths: M pkgs/applications/office/paperwork/default.nix Log Message: --- Merge pull request #22551 (paperwork locale path) Fixes the locale path, which I got wrong in 7199f1bd9470f6acabcfadddef50d4934727796e. It should have been "$out/share", because Paperwork itself already appends /locale to the path. Thanks to @symphorien for the fix. Compare: https://github.com/NixOS/nixpkgs/compare/44820907afab...6d6cf3f24acc___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] a5e966: nixos/test: Fix escaping for copyFileFromHost
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: a5e9668c5c2a43703a4f49ae673909c66acf7785 https://github.com/NixOS/nixpkgs/commit/a5e9668c5c2a43703a4f49ae673909c66acf7785 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-17 (Fri, 17 Feb 2017) Changed paths: M nixos/lib/test-driver/Machine.pm Log Message: --- nixos/test: Fix escaping for copyFileFromHost A long-time issue and one of the reasons I've never used that function before. So let's remove that todo-comment and escape the contents properly. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @edolstra Commit: 32c2e8f4aeea5a35302b450ed4233dd1af6b22c8 https://github.com/NixOS/nixpkgs/commit/32c2e8f4aeea5a35302b450ed4233dd1af6b22c8 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-17 (Fri, 17 Feb 2017) Changed paths: M nixos/modules/services/misc/taskserver/helper-tool.py Log Message: --- taskserver/helpertool: Fix error message on export The error message displays that a specific user doesn't exist in an organisation, but uses the User object's name attribute to show which user it was. This is basically a very stupid chicken and egg problem and easily fixed by using the user name provided on the command line. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 78fe00da7c2d6c4e5746558f366e1c8fbf97fb47 https://github.com/NixOS/nixpkgs/commit/78fe00da7c2d6c4e5746558f366e1c8fbf97fb47 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-17 (Fri, 17 Feb 2017) Changed paths: M nixos/modules/services/misc/taskserver/default.nix M nixos/modules/services/misc/taskserver/doc.xml M nixos/modules/services/misc/taskserver/helper-tool.py Log Message: --- taskserver: Allow helper tool in manual config The helper tool so far was only intended for use in automatic PKI handling, but it also is very useful if you have an existing CA. One of the main advantages is that you don't need to specify the data directory anymore and the right permissions are also handled as well. Another advantage is that we now have an uniform management tool for both automatic and manual config, so the documentation in the NixOS manual now applies to the manual PKI config as well. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: c7bbb93878a0b9772c34a6c19eb3f1b15a82a345 https://github.com/NixOS/nixpkgs/commit/c7bbb93878a0b9772c34a6c19eb3f1b15a82a345 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-17 (Fri, 17 Feb 2017) Changed paths: M nixos/modules/services/misc/taskserver/default.nix Log Message: --- taskserver: Pass configuration via command line Putting an include directive in the configuration file referencing a store path with the real configuration file has the disavantage that once we change the real configuration file the store path is also a different one. So we would have to replace that include directive with the new configuration file, which is very much error-prone, because whenever taskd modifies the configuration file on its own it generates a new one with *only* the key/value options and without any include directives. Another problem is that we only added the include directive on the first initalization, so whenever there is *any* configuration change, it won't affect anything. We're now passing all the configuration options via command line, because taskd treats everything in the form of --= to be a configuration directive. This also has the effect that we now no longer have extraConfig, because configuration isn't a file anymore. Instead we now have an attribute set that is mapped down to configuration options. Unfortunately this isn't so easy with the way taskd is configured, because there is an option called "server" and also other options like "server.cert", "server.key" and so on, which do not map very well to attribute sets. So we have an exception for the "server" option, which is now called "server.listen", because it specifies the listening address. Signed-off-by: aszlig <asz...@redmoonstudios.org> Fixes: #22705 Commit: 5af8b120a6d5e8abaf2e0397e9ac077a3ab33897 https://github.com/NixOS/nixpkgs/commit/5af8b120a6d5e8abaf2e0397e9ac077a3ab33897 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-17 (Fri, 17 Feb 2017) Changed paths: M nixos/tests/taskserver.nix Log Message: --- nixos/tests/taskserver: Add test for manual config This subtest actually serves two purposes: 1. Test manual PKI configuration 2. Test changing of configuration files In order to only test manual PKI configuration it would have been enough to just add another server with a manual config. But as the switch from automatic PKI config to manual config is probably one of the most fundamental cha
[Nix-commits] [NixOS/nixpkgs] e76c8a: nixos/tests/chromium: Run tests as normal user
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: e76c8ac44e3636d90f28e069449f996bd3b9b18a https://github.com/NixOS/nixpkgs/commit/e76c8ac44e3636d90f28e069449f996bd3b9b18a Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-11 (Sat, 11 Feb 2017) Changed paths: M nixos/tests/chromium.nix Log Message: --- nixos/tests/chromium: Run tests as normal user The tests have failed because Chromium has started up displaying the following error message in a dialog window: Chromium can not be run as root. Please start Chromium as a normal user. If you need to run as root for development, rerun with the --no-sandbox flag. So let's run as user "alice" and pass all commands using the small helper function "ru" (to keep it short, it's for "Run as User"). Tested it by running the "stable" test on x86_64-linux. Signed-off-by: aszlig <asz...@redmoonstudios.org> Reported-by: @globin (cherry picked from commit cd10e3c4ffa3d6c729aab8778bf6027415025c44) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 25b61c: pyocr: Use skip instead of expectedFailure
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 25b61cc897ccca0c01fb2c8cb73cd5a283f749d2 https://github.com/NixOS/nixpkgs/commit/25b61cc897ccca0c01fb2c8cb73cd5a283f749d2 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-07 (Tue, 07 Feb 2017) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- pyocr: Use skip instead of expectedFailure Since the update of imagemagick in 5e753c1a65e106ffaeb71ad3fa66a13b2dfaf5d5 there are certain test cases which now unexpectly succeed and in turn cause the whole build to fail. So in order to prevent this from happening let's skip those tests properly instead of running them and expect them to fail. Tested by building pythonPackages.pyocr on x86_64-linux. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] cf94e1: linux-testing: 4.10-rc4 -> 4.10-rc7
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: cf94e1862707aa48f423ce441b4bc058c1fe39a0 https://github.com/NixOS/nixpkgs/commit/cf94e1862707aa48f423ce441b4bc058c1fe39a0 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-07 (Tue, 07 Feb 2017) Changed paths: M pkgs/os-specific/linux/kernel/linux-testing.nix Log Message: --- linux-testing: 4.10-rc4 -> 4.10-rc7 Tested via building the linux_testing attribute only, not in production. Verified unpacked tarball with GnuPG: gpg: Signature made Mon 06 Feb 2017 12:21:50 AM CET gpg:using RSA key 79BE3E4300411886 gpg: Good signature from "Linus Torvalds <torva...@linux-foundation.org>" [unknown] Primary key fingerprint: ABAF 11C6 5A29 70B1 30AB E3C4 79BE 3E43 0041 1886 Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] cd10e3: nixos/tests/chromium: Run tests as normal user
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: cd10e3c4ffa3d6c729aab8778bf6027415025c44 https://github.com/NixOS/nixpkgs/commit/cd10e3c4ffa3d6c729aab8778bf6027415025c44 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-07 (Tue, 07 Feb 2017) Changed paths: M nixos/tests/chromium.nix Log Message: --- nixos/tests/chromium: Run tests as normal user The tests have failed because Chromium has started up displaying the following error message in a dialog window: Chromium can not be run as root. Please start Chromium as a normal user. If you need to run as root for development, rerun with the --no-sandbox flag. So let's run as user "alice" and pass all commands using the small helper function "ru" (to keep it short, it's for "Run as User"). Tested it by running the "stable" test on x86_64-linux. Signed-off-by: aszlig <asz...@redmoonstudios.org> Reported-by: @globin ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 87cc20: nixos/networkd: Fix eval error for defaultGateway
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 87cc20eddbabce1572c8f10d8872a592b53a58ce https://github.com/NixOS/nixpkgs/commit/87cc20eddbabce1572c8f10d8872a592b53a58ce Author: aszlig <asz...@redmoonstudios.org> Date: 2017-02-07 (Tue, 07 Feb 2017) Changed paths: M nixos/modules/tasks/network-interfaces-systemd.nix Log Message: --- nixos/networkd: Fix eval error for defaultGateway Regression introduced by 0cb487ee044bbe5cfa1d6421df385b6bc2447bd2. This changed the result for defaultGateway to be a submodule instead of just a plain string, so instead of using just cfg.defaultGateway we need to pass cfg.defaultGateway.address now. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @abbradar ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 9482c1: blivet: Update patch for UUIDs to latest version
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: 9482c1d0d9b31c5766847fca092cb8558e329a34 https://github.com/NixOS/nixpkgs/commit/9482c1d0d9b31c5766847fca092cb8558e329a34 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-28 (Sat, 28 Jan 2017) Changed paths: M pkgs/development/python-modules/blivet/default.nix M pkgs/development/python-modules/blivet/uuids.patch Log Message: --- blivet: Update patch for UUIDs to latest version This version largely differs from the previous version in that we now set the UUID via the "uuid" keyword argument rather than introducing a new "new_uuid" kwarg. We now need to reorder the uuids.patch and the ntfs-formattable.patch, because the latter got merged into the upstream 2.1-devel branch and the uuids.patch has been rebased against the newest HEAD of 2.1-devel. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 0a18f5953217308f94ea777130bf2efa0f748d29 https://github.com/NixOS/nixpkgs/commit/0a18f5953217308f94ea777130bf2efa0f748d29 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-28 (Sat, 28 Jan 2017) Changed paths: M pkgs/tools/filesystems/nixpart/default.nix Log Message: --- nixpart: Update to latest master version This only renames the "new_uuid" keyword argument to be just "uuid", as changed in the previous nixpkgs commit on blivet. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/6c9a0e0324e5...0a18f5953217___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 61b673: gajim: Enable running test suite
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 61b673c1f1dd8aadb78d110ac14765959ad3f46c https://github.com/NixOS/nixpkgs/commit/61b673c1f1dd8aadb78d110ac14765959ad3f46c Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-27 (Fri, 27 Jan 2017) Changed paths: M pkgs/applications/networking/instant-messengers/gajim/default.nix Log Message: --- gajim: Enable running test suite This is a bit more involved, because first of all, the tests aren't distributed in the release tarball and second the test suite currently doesn't work but there are fixes for it that get released in the next upstream patch, so we cherry-pick the relevant commits as patches. We now also switch to fetching the tarball directly from their GitLab instance, because - as mentioned - it contains the tests and also contains the icon.index file, which we already had included as a patch and we can now drop it. The URLs to the cherry-picked upstream commits are the following: https://dev.gajim.org/gajim/gajim/commit/1f0d7387fd020df5dfc9a6349005ec7dedb7c008 https://dev.gajim.org/gajim/gajim/commit/491d32a2ec13ed3a482e151e0b403eda7b4151b8 https://dev.gajim.org/gajim/gajim/commit/46a19733d208fbd2404cbaeedd8c203d0b6557a4 All of these commits are in the gajim_0.16 branch and are thus very likely becoming part of Gajim 0.16.7. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @7c6f434c ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] d01b94: nixos/doc/installing: Fix typo in
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: d01b9493c982c308d929211dcbcb4efea0207cf4 https://github.com/NixOS/nixpkgs/commit/d01b9493c982c308d929211dcbcb4efea0207cf4 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M nixos/doc/manual/installation/installing.xml Log Message: --- nixos/doc/installing: Fix typo in The tag wasn't properly closed which caused the manual build to fail. Tested with: nix-build nixos/release.nix -A manual.x86_64-linux Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] ca7923: nss: Provide a more stable URL for pkgconfig patch
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: ca7923f1117571cb13bd74b349156b963b4b7526 https://github.com/NixOS/nixpkgs/commit/ca7923f1117571cb13bd74b349156b963b4b7526 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M pkgs/development/libraries/nss/default.nix Log Message: --- nss: Provide a more stable URL for pkgconfig patch Since 2bf0f84f1ff18057c5a2af0d35bc90c264b3e056, the patch isn't in our repository anymore but being fetched from its origin. However, the origin URL is always pointing to the latest master version of Gentoo. This has the downside that whenever Gentoo changes the patch, our build of NSS will be broken. Also, I'm providing a comment here indicating what the patch does. As to the reason *why* the patch is there, I vaguely remeber seeing a few libraries/applications that depend on NSS relying that there's a pkgconfig file. After checking a few distros, they all seem to have it: https://anonscm.debian.org/cgit/pkg-mozilla/nss.git/tree/debian?id=5306c4192d6bc0a2685842e9fd533196e7302297 https://apps.fedoraproject.org/packages/nss-devel/ https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/nss=3f7f54b357e23b7ac1cec849693334ad29be07d2 The issue is already reported upstream but hasn't been fixed yet: https://bugzilla.mozilla.org/show_bug.cgi?id=530672 Tested by building nss on x86_64-linux (the hash didn't change anyway, but just to be sure). Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 69149f: blivet: Remove all imports of pyanaconda
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: 69149f31222df5331c0ac8ac8914c0961f19708a https://github.com/NixOS/nixpkgs/commit/69149f31222df5331c0ac8ac8914c0961f19708a Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-24 (Tue, 24 Jan 2017) Changed paths: M pkgs/development/python-modules/blivet/default.nix Log Message: --- blivet: Remove all imports of pyanaconda We already had stubs for some pyanaconda imports so far, but some functionality like enable_installer_mode() inherently depends on it, so let's remove enable_installer_mode(). Another occurence of pyanaconda import is in storage_initialize(): from pyanaconda.flags import flags as anaconda_flags flags.update_from_anaconda_flags(anaconda_flags) This is an installer-specific function which should also be quite tied to pyanaconda, but instead of removing this function altogether, we just remove the import, because it only appends certain flags from the pyanaconda module. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: c1698de337d623aef51bae1a9e1d9dfc1d26 https://github.com/NixOS/nixpkgs/commit/c1698de337d623aef51bae1a9e1d9dfc1d26 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-24 (Tue, 24 Jan 2017) Changed paths: M pkgs/development/python-modules/blivet/uuids.patch Log Message: --- blivet: Update patch for setting UUIDs This just contains one additional commit which fixes various pylint errors. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 7b4c696352500483cc078460f4200da941856620 https://github.com/NixOS/nixpkgs/commit/7b4c696352500483cc078460f4200da941856620 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-24 (Tue, 24 Jan 2017) Changed paths: M pkgs/development/python-modules/blivet/default.nix Log Message: --- blivet: Run pocketlint tests in checkPhase So far we had disabled the tests while referring to the NixOS VM test instead. However, it's desirable to run as much tests as we can, so let's run the pocketlint tests in checkPhase instead of skipping it altogether. In my case this is very useful because it would have caught a few errors during development of the UUIDs pull request: https://github.com/rhinstaller/blivet/pull/537 But even if we're not directly developing for the upstream project, this also catches Nix-related errors, such as references against pyanaconda which might still exist or exist again after an update. I'm using a list to accumulate find arguments because I wanted to avoid endless repetitions of -o -path xyz -prune. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 6c9a0e0324e52a8a59aefd4e25862371a69a2032 https://github.com/NixOS/nixpkgs/commit/6c9a0e0324e52a8a59aefd4e25862371a69a2032 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-24 (Tue, 24 Jan 2017) Changed paths: M pkgs/development/python-modules/blivet/default.nix Log Message: --- blivet: Verify PEP8 compliance in checkPhase This is also part of blivet's "make check", so I've included it for completeness and almost verbatim because blivet does not comply to a few points in PEP8, like when it comes to line length. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/528c6ac8eac7...6c9a0e0324e5___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] c46981: nixos/storage: Generate UUID for each device spec
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: c4698167e12c5bf8c8d201dc0d2c4b25dcfcaede https://github.com/NixOS/nixpkgs/commit/c4698167e12c5bf8c8d201dc0d2c4b25dcfcaede Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-06 (Fri, 06 Jan 2017) Changed paths: M nixos/modules/tasks/storage/default.nix Log Message: --- nixos/storage: Generate UUID for each device spec We want to have deterministic UUIDs for every device specification in order to avoid the need to manually set labels all over the place. Of course, we could internally set labels instead of precomputing UUIDs, but labels have different length restrictions for every file system (for example XFS has a maximum of 12 bytes, for ext4 it's 16 bytes). In addition to that we remove the ability for people to set their own labels during runtime. The UUIDs generated here are based on version 5: https://tools.ietf.org/html/rfc4122#section-4.1.3 Our variant deviates from this a bit in that we use string concatenation to build up the input for the SHA1 hash instead of binaries. The results however are pretty much the same and in our part the most important aspect is determinism rather than having a truly unique value across the whole planet. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 17d464b9f77f90ce319efc5b91a96489e15ae7ff https://github.com/NixOS/nixpkgs/commit/17d464b9f77f90ce319efc5b91a96489e15ae7ff Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-06 (Fri, 06 Jan 2017) Changed paths: M nixos/modules/tasks/storage/default.nix M nixos/modules/tasks/storage/lib.nix Log Message: --- nixos/storage: Switch to a new mkDeviceSpecOption Having just a single type for a device specification doesn't work out well if we want to have an apply function, which we do want, because it makes more sense if we want to resolve such a device specification without using builtins.match all over the place. It also improves a lot in readability of the option descriptions, because every such option now has not only a description of what a device specification is but also lists the valid types for the device specification. This has another advantage that instead for something like the following: Type: list of device specification of .s The type description is now just: Type: list of device specifications We're also heading for more consistency, speaking about "device specification" or shortly "devspec". Say if we have something like "storage.foo.bar", "foo.bar" is the "device specification" and "foo" is the "device specification type" and "bar" is the "device specification name". Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 8e861d2eeb99d86096efa6b0e482e69d6e4dfb6a https://github.com/NixOS/nixpkgs/commit/8e861d2eeb99d86096efa6b0e482e69d6e4dfb6a Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-06 (Fri, 06 Jan 2017) Changed paths: M nixos/modules/tasks/storage/default.nix M nixos/modules/tasks/storage/lib.nix Log Message: --- nixos/storage: Make devspec an attrset internally So far we passed the device specification as-is to nixpart, but from within the module system it's quite tricky to validate or look up such a string, because we need to parse it every time we need to do a look up an a configuration value in "storage.*". Now a device specification is an attribute set consisting of a `name' and a `type' attribute. We also have a new applyTypeContainer attribute we need to pass to mkDeviceSpecOption so that we can properly convert things such as "listOf devspecType" into a list of valid internal representations of device specifications. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 2b0095599c649433d1d80e42c5a540af53c0df50 https://github.com/NixOS/nixpkgs/commit/2b0095599c649433d1d80e42c5a540af53c0df50 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-06 (Fri, 06 Jan 2017) Changed paths: M nixos/modules/tasks/storage/lib.nix Log Message: --- nixos/storage/lib: Propagate devspec's config This is handy if we want to look up configuration options for a specific device specification, so with only the internal representation of a devspec we can simply say devspec.uuid to get a generated UUID. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: a8952b1ae4c282808925bb6054c991edf38186d0 https://github.com/NixOS/nixpkgs/commit/a8952b1ae4c282808925bb6054c991edf38186d0 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-06 (Fri, 06 Jan 2017) Changed paths: M nixos/modules/tasks/storage/default.nix Log Message: --- nixos/storage: Integrate storage UUIDs in fs/swaps This implements the deterministically
[Nix-commits] [NixOS/nixpkgs] c0c04c: nixos/tests/storage: Pass system to storage eval
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: c0c04ca1d3800625b8e0b8d351e5d3f528ce5fcb https://github.com/NixOS/nixpkgs/commit/c0c04ca1d3800625b8e0b8d351e5d3f528ce5fcb Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-05 (Thu, 05 Jan 2017) Changed paths: M nixos/tests/storage.nix Log Message: --- nixos/tests/storage: Pass system to storage eval This fixes the following test failure on i686-linux: https://headcounter.org/hydra/build/1562265/nixlog/13/raw The reason we get an exec format error here is that we evaluate the storage spec using the host system while the rest is evaluaten using the system attribute from the test's args. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 02765b: nixos/storage/disk: Allow only one match method
Branch: refs/heads/nixpart
Home: https://github.com/NixOS/nixpkgs
Commit: 02765b407fee962ef42accbeabfdfea3f563cf46
https://github.com/NixOS/nixpkgs/commit/02765b407fee962ef42accbeabfdfea3f563cf46
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M nixos/modules/tasks/storage/default.nix
Log Message:
---
nixos/storage/disk: Allow only one match method
Having multiple matchers is a bit tricky if we don't know how they
should be combined. For example if we have a match on a label and a
device name and both produce valid matches, which one should we choose?
So let's restrict the use of device matchers to allow only one method
right now. If we later figure out a better way how to combine these
matchers, we can still lift this restriction easily.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 96bb3b1ae705db257c1d6520604a758e5976146e
https://github.com/NixOS/nixpkgs/commit/96bb3b1ae705db257c1d6520604a758e5976146e
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M nixos/tests/storage.nix
Log Message:
---
nixos/tests/storage: Add subtest for matchers
We want to make sure that the options defined in disk.${name}.match are
working. So we define a bunch of disks with all currently available
matching methods and check afterwards if the devices get mounted.
Of course the "check afterwards" part is solely theoretical because this
is not yet supported in nixpart.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 9dca14e438a0f64319900ba5bd24d2055340ab36
https://github.com/NixOS/nixpkgs/commit/9dca14e438a0f64319900ba5bd24d2055340ab36
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M nixos/modules/tasks/storage/disk.nix
Log Message:
---
nixos/storage/disk: Fix wording of allowIncomplete
Just remove the redundant "array", because RAID already includes array
in the A.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: acc1c0b3e45b1399bff64ab65a6fc4d8bb4936a2
https://github.com/NixOS/nixpkgs/commit/acc1c0b3e45b1399bff64ab65a6fc4d8bb4936a2
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M nixos/tests/storage.nix
Log Message:
---
nixos/tests/storage: Show stdout of nixpart -m
We want to know the messages printed to stdout regardless of whether
nixpart -m has failed or not, primarily because it makes debugging
easier (just adding "print(something)" should suffice).
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 1531442588c148b79cd73f9e57799c061dec21f8
https://github.com/NixOS/nixpkgs/commit/1531442588c148b79cd73f9e57799c061dec21f8
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M nixos/tests/storage.nix
Log Message:
---
nixos/tests/storage: Don't always check /mnt
So far we checked whether /mnt is a valid mountpoint during invocation
of remountAndCheck. Now since we have the "matchers" sub test, we no
longer have anything mounted directly in /mnt, so it doesn't make sense
to check it unconditionally.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 5ccda7bde6d119cae1393f0f5110560bd3ce8f35
https://github.com/NixOS/nixpkgs/commit/5ccda7bde6d119cae1393f0f5110560bd3ce8f35
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M nixos/tests/storage.nix
Log Message:
---
nixos/tests/storage/matchers: Assign labels
We're basically destroying the initial information that's relevant for
the matchers to actually match the corresponding devices, so we need
those labels to find the newly created dummy ext4 file systems again.
This also makes the definitions for fileSystems less redundant, because
we now generate it using listToAttrs and genList.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 26c6ce6d52a171a0cb865fbf6d0650ba364cfffd
https://github.com/NixOS/nixpkgs/commit/26c6ce6d52a171a0cb865fbf6d0650ba364cfffd
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M pkgs/tools/filesystems/nixpart/default.nix
Log Message:
---
nixpart: Update to latest master version
Adds support for mounting of file systems, which means that now the
"btrfs", "ext" and "matchers" storage tests are succeeding.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Compare: https://github.com/NixOS/nixpkgs/compare/4fbea844332e...26c6ce6d52a1___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 567ce6: nixos/storage: Move module into its own directory
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: 567ce6863b219bf40292c9539b1616b3fbd8df65 https://github.com/NixOS/nixpkgs/commit/567ce6863b219bf40292c9539b1616b3fbd8df65 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-02 (Mon, 02 Jan 2017) Changed paths: M nixos/modules/module-list.nix R nixos/modules/tasks/storage.nix A nixos/modules/tasks/storage/default.nix Log Message: --- nixos/storage: Move module into its own directory We're going to break down various parts of the module into smaller files, so that the main default.nix doesn't get cluttered up by implementation details. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: cf912a178a948955927d8304c25d3e2654e3a632 https://github.com/NixOS/nixpkgs/commit/cf912a178a948955927d8304c25d3e2654e3a632 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-03 (Tue, 03 Jan 2017) Changed paths: M nixos/modules/tasks/storage/default.nix A nixos/modules/tasks/storage/lib.nix Log Message: --- storage: Move types and sizeUnits into new lib.nix This should leave the default.nix with only option declarations and without our custom types. The move of sizeUnits to lib.nix is currently a bit of a workaround, but we're going to untangle that later. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 0b656c0c550836a2489114c6ff6047e32482600a https://github.com/NixOS/nixpkgs/commit/0b656c0c550836a2489114c6ff6047e32482600a Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-04 (Wed, 04 Jan 2017) Changed paths: M nixos/modules/tasks/storage/default.nix A nixos/modules/tasks/storage/disk.nix Log Message: --- nixos/storage: Add options for matching disks This is preliminary because this needs to be properly type-constrained and with a fallback to the device name. Also I'm not yet sure whether we should create match.script via the NixOS module system or within nixpart. But before deciding on this, the current implementation at least serves the purpose of documentation. Even though quite a bit is subject to change the documentation on the individual matchers will still largely apply. However what's is going to be changed is how we're going to handle the "match" option. Do we want it to be an additional submodule or do we want it to be like it is now? With the current state however it's a bit ugly because on one side we allow multiple matchers but on the other side we don't allow the same matcher to apply more than once. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 04dad9e5d2848487642bfcfd7fa26a3ba8cb3c89 https://github.com/NixOS/nixpkgs/commit/04dad9e5d2848487642bfcfd7fa26a3ba8cb3c89 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-04 (Wed, 04 Jan 2017) Changed paths: M nixos/modules/tasks/storage/default.nix Log Message: --- nixos/storage: Add documentation to storage.disk We only had short descriptions for the options defined via deviceTypes and thus we now also have a doc attribute that specifies a longer description of the option. This is needed in order for the user to know what's the default matching method in case no particular matcher is specified. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: d5bcbcd874e112439126f1a0aa8dcb668b9c6a5a https://github.com/NixOS/nixpkgs/commit/d5bcbcd874e112439126f1a0aa8dcb668b9c6a5a Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-04 (Wed, 04 Jan 2017) Changed paths: M nixos/modules/tasks/storage/default.nix M nixos/modules/tasks/storage/disk.nix Log Message: --- nixos/storage/disk: Make .match a submodule This has the advantage of making it easier to set a default value and also makes documentation a bit more "in place", so that we don't need to write documentation about matches in storage.disk but in storage.disk.*.match instead. The default value is now match.name = diskName, where diskName is the name defined by storage.disk.NAME. Of course, we still have the limitation that we can't set multiple matchers of the same type, but we can implement that easily by adding another option "matchers" or "matches" that takes a list of matcher submodules. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 0fb96619694464cc26cfcdcdbbfb64d094ae8bf4 https://github.com/NixOS/nixpkgs/commit/0fb96619694464cc26cfcdcdbbfb64d094ae8bf4 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-04 (Wed, 04 Jan 2017) Changed paths: M nixos/modules/tasks/storage/default.nix M nixos/modules/tasks/storage/disk.nix Log Message: --- nixos/storage/disk: Add apply function to script Having this as ready to be instantiated derivation is better than doing this within nixpart, because we can m
[Nix-commits] [NixOS/nixpkgs] c32d40: nixos/doc: Add stub chapter for storage config
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: c32d4097fe7f04090efa6ecc77437e1c0b9fc293 https://github.com/NixOS/nixpkgs/commit/c32d4097fe7f04090efa6ecc77437e1c0b9fc293 Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-02 (Mon, 02 Jan 2017) Changed paths: M nixos/doc/manual/configuration/configuration.xml A nixos/doc/manual/configuration/storage.xml Log Message: --- nixos/doc: Add stub chapter for storage config Currently only contains a small warning about the options being experimental and is going to be written as we go with refactoring the storage module. Note that I've put it to be included *before* file-systems.xml because the storage configuration also includes setting various fileSystems.* options. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 1c746cc0392ab4a9815441121dbab4ae7cc0eb2c https://github.com/NixOS/nixpkgs/commit/1c746cc0392ab4a9815441121dbab4ae7cc0eb2c Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-02 (Mon, 02 Jan 2017) Changed paths: M nixos/tests/blivet.nix Log Message: --- nixos/tests/blivet: Add support for HFS+ This is needed for the macefi and HFS tests and I'm adding solely for the sake of completeness so that we have the biggest test coverage possible. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: ddc083d8729dfdb77cf160efc3df100658a539ec https://github.com/NixOS/nixpkgs/commit/ddc083d8729dfdb77cf160efc3df100658a539ec Author: aszlig <asz...@redmoonstudios.org> Date: 2017-01-02 (Mon, 02 Jan 2017) Changed paths: M pkgs/development/python-modules/blivet/default.nix A pkgs/development/python-modules/blivet/test-fixes.patch Log Message: --- blivet: Include patch fixing tests So it turned out that the test failures we get with tmpfs are actually an upstream problem because they seem to be not running tests that require to be run as root. Here is a paste from an earlier run posted by @vojtechtrefny: https://paste.fedoraproject.org/518572/33694971/ The patch I'm using here is from @vojtechtrefny as well (pull request rhinstaller/blivet#532) and should not only fix the tmpfs tests but a few other issues. After running the test suite with this patch applied the tests are now succeeding: https://headcounter.org/hydra/log/ncy4wdpnhzww5yfqv9p8l9cl97dp3cac-vm-test-run-blivet.drv Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/6217686df59b...ddc083d8729d___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixops] 8ce1cc: Bundle ca-certs with hetzner bootstrap, fixes #356
Branch: refs/heads/master
Home: https://github.com/NixOS/nixops
Commit: 8ce1ccc33bc3a9d25ff969bdc658d11187276f29
https://github.com/NixOS/nixops/commit/8ce1ccc33bc3a9d25ff969bdc658d11187276f29
Author: Graham Christensen <gra...@grahamc.com>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M nix/hetzner-bootstrap.nix
Log Message:
---
Bundle ca-certs with hetzner bootstrap, fixes #356
Commit: b09e618ed63142e1f4babb3d7f5aeb9d63e2b744
https://github.com/NixOS/nixops/commit/b09e618ed63142e1f4babb3d7f5aeb9d63e2b744
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-02 (Mon, 02 Jan 2017)
Changed paths:
M nix/hetzner-bootstrap.nix
Log Message:
---
Merge pull request #564 from grahamc/fix-certs
This bundles ca-certs with hetzner-bootstrap.nix, so it should fix #356
where @manveru reported that binary cache substititions didn't work
because of certificate errors.
Although the change is quite trivial I usually try to test things on a
real machine before actually merging it, but I currently don't have a
free Hetzner machine available for testing.
I'm merging this based on @grahamc's assertion "This patch has worked on
provisioning several boxes" and testing this by building and manually
verifying the bootstrap installer and also running the "hetzner" VM test
on x86_64-linux.
So I think the worst thing that could happen is that #356 isn't fixed
after all.
Fixes: #356
Commit: 9c3aecba84208438736538f4c9fd6914bed05b90
https://github.com/NixOS/nixops/commit/9c3aecba84208438736538f4c9fd6914bed05b90
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-02 (Mon, 02 Jan 2017)
Changed paths:
M tests/hetzner-backend/repository.nix
Log Message:
---
tests/hetzner: Make getting GPG key ID more robust
GnuPG has a --with-colons flag, so we don't need to use a complicated
sed expression to extract the key ID.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: a29d3344065ab83c151ad119f076473ebdecad0d
https://github.com/NixOS/nixops/commit/a29d3344065ab83c151ad119f076473ebdecad0d
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-02 (Mon, 02 Jan 2017)
Changed paths:
M tests/hetzner-backend/repository.nix
Log Message:
---
tests/hetzner/repos: Pin GnuPG version to v2.0
I ran into this while trying to run tests prior to merging #564 (merge
commit b09e618ed63142e1f4babb3d7f5aeb9d63e2b744).
The default GnuPG version in is 2.1, but the Debian version
used while building the Debian repository is GnuPG version 2.0, so we
need to make sure both versions match at least in major and minor.
The test for the Hetzner backend now still fails, but at least it
doesn't fail anymore because one of its dependencies are failing.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: af1a6a575cf828b942804ef99970493dfc3ac094
https://github.com/NixOS/nixops/commit/af1a6a575cf828b942804ef99970493dfc3ac094
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-02 (Mon, 02 Jan 2017)
Changed paths:
M tests/hetzner-backend/default.nix
Log Message:
---
tests/hetzner: Fix up coordinator dependencies
As we don't have networking access within tests, we also need to add
pkgs.lib{xml2,xslt}.dev or pkgs.lib{xml2,xslt} as fallback.
I'm using .dev here, because it references all of the other outputs of
the corresponding library as well so we don't need to list all the
possible outputs.
Unfortunately, I'm not quite sure what has led to this requirement,
because I don't want to bisect a whole lot of changes since NixOS
release 16.03 just to find out the origin of this.
Adding these dependencies now causes the test to succeed with NixOS
unstable and release-16.09.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Compare: https://github.com/NixOS/nixops/compare/1ce9aff239d3...af1a6a575cf8___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] e17bb6: nixpart: Move out of python-packages.nix
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: e17bb6195d73db1a30a46298ad5047bb0fa20472 https://github.com/NixOS/nixpkgs/commit/e17bb6195d73db1a30a46298ad5047bb0fa20472 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M nixos/tests/storage.nix M pkgs/tools/filesystems/nixpart/default.nix M pkgs/top-level/all-packages.nix M pkgs/top-level/python-packages.nix Log Message: --- nixpart: Move out of python-packages.nix The reason why it was in python-packages.nix is because we needed to have a way to run this with different Python versions and also that the project's API could be used by another program or library. This is not intended so far and even if we're going to do that, we can still move it back into python-packages.nix. This now should make it easier to override the arguments of the package and also should be easier to install inside a user env via "nix-env -iA nixpart" instead of "nix-env -iA python3Packages.nixpart". Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 85e72e3abd4cb48cb4d387d893918421666ad5ce https://github.com/NixOS/nixpkgs/commit/85e72e3abd4cb48cb4d387d893918421666ad5ce Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M nixos/release.nix M nixos/tests/storage.nix Log Message: --- nixos/tests/storage: Split into sub-derivations Running a specific test case is a bit icky if you need to comment out the parts you don't want to run or wait for tests to succeed that you're not even interested in. This splits the subtests into its own derivations that can be simply referenced using -A of nix-build/nix-instantiate. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: d6f428c0d5862a05b385d7b3759efd71b4fe08e1 https://github.com/NixOS/nixpkgs/commit/d6f428c0d5862a05b385d7b3759efd71b4fe08e1 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M nixos/modules/tasks/storage.nix Log Message: --- nixos/storage: Add defaults for clear/initlabel I haven't yet stumbled on this because I have always set these options within test configurations. So this now allows to set empty disk options, which is fine (after all we just need to reference them using the storage option in fileSystems and swapDevices). Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 850466140cb3d28d5f9ab696eb686c6e7d438ff7 https://github.com/NixOS/nixpkgs/commit/850466140cb3d28d5f9ab696eb686c6e7d438ff7 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M nixos/tests/storage.nix Log Message: --- nixos/tests/storage: Fix exporting storage.xml Using copyFileFromHost() doesn't work if the file contains single quotes, because they're not escaped properly. So let's move to a more robust way to provide storage.xml to the guests (via environment.etc), because apart from that escaping issue we really don't need anything like copyFileFromHost() anymore because every subtest now resides in its own derivation. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: fa05131461d723062ca90c5797c7be8327a41da9 https://github.com/NixOS/nixpkgs/commit/fa05131461d723062ca90c5797c7be8327a41da9 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M nixos/tests/storage.nix Log Message: --- nixos/tests/storage: Rename --from-xml to --xml I've changed this in aszlig/nixpart@7529c47b05974500b4aaaff4e6644f03900061fe. So let's fix it here :-) Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 81152a51a4ebbfd4026528137b47530290ea84cf https://github.com/NixOS/nixpkgs/commit/81152a51a4ebbfd4026528137b47530290ea84cf Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M pkgs/tools/filesystems/nixpart/default.nix Log Message: --- nixpart: Update to latest master version This is mainly for testing purposes during the WIP branch, but it should actually do partitioning for some of the NixOS VM tests (particularily the .btrfs test). I've tagged this specifically as unstable-1.0.0 to make sure noone is seriously going to use it yet (except for playing around of course). Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/ccbee460da2c...81152a51a4eb___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] ccbee4: nixos/tests/blivet: Fix typo in comment
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: ccbee460da2c875a04602c63e886b45fd11821da https://github.com/NixOS/nixpkgs/commit/ccbee460da2c875a04602c63e886b45fd11821da Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M nixos/tests/blivet.nix Log Message: --- nixos/tests/blivet: Fix typo in comment It's the volume_key _binary_ not the volume_key "something" :-) Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 108ba6: nixos/tests/blivet: Refactor test runner
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: 108ba655a2f79fa1a012442de94d3d10cdc4ae9d https://github.com/NixOS/nixpkgs/commit/108ba655a2f79fa1a012442de94d3d10cdc4ae9d Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-26 (Mon, 26 Dec 2016) Changed paths: M nixos/tests/blivet.nix M pkgs/development/libraries/libblockdev/default.nix M pkgs/development/python-modules/blivet/default.nix Log Message: --- nixos/tests/blivet: Refactor test runner First of all, this gets rid of all the copying of the test sources by providing them via a separate output directly from the corresponding packages. This also simplifies the way we retrieve environment variables needed for running the tests. Previously we used one derivation for every environment variable, the latter being defined in an attrset so we can make customizations. We no longer need these customizations, especially because libblockdev and blivet are both rhinstaller projects and pretty much have the same testing setup. So now we gather these variables in one derivation and also do not fetch LD_LIBRARY_PATH anymore, because all of the library path references are built into the corresponding libraries. I'm also no longer using "with pkgs.lib;" for the whole expression to make sure we can catch eval errors very early on (my Vim config does "nix-instantiate --parse" when writing the file). Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: e919a460a769fe6f6aee1405775efb423a478aef https://github.com/NixOS/nixpkgs/commit/e919a460a769fe6f6aee1405775efb423a478aef Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-27 (Tue, 27 Dec 2016) Changed paths: M pkgs/development/python-modules/blivet/default.nix A pkgs/development/python-modules/blivet/no-hawkey.patch Log Message: --- blivet: 0.67 -> 2.1.7 This is basically a bump from the stone age to the current version, so the changelog would be a bit long to summarize here, hence here is the URL: https://github.com/rhinstaller/blivet/blob/blivet-2.1.7/python-blivet.spec#L80-L1278 A few of the direct dependencies of blivet are now direct depencies of libblockdev, which inself is a replacement for pyblock in C and uses gobject-introspection to resolve the C symbols. We also patch out hawkey and replace it with a wrapper around nix-store, because on NixOS we can't use libsolv to resolve dependencies. Right now, I'm also disabling the EDD tests, because I think they shouldn't work within our VM test environments, but I need to dig a bit more into that. In the end we now still have 12 failing test cases which we need to resolve: https://headcounter.org/hydra/log/1rbpjrrjvc95ldcmmrqbangh5ssizygr-vm-test-run-blivet.drv Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/d99ceaeb9eb6...e919a460a769___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 0f6f3a: nixos: Add storage opt to fileSystems/swapDevices
Branch: refs/heads/nixpart Home: https://github.com/NixOS/nixpkgs Commit: 0f6f3a961e701965f10175c539f743fcace7392f https://github.com/NixOS/nixpkgs/commit/0f6f3a961e701965f10175c539f743fcace7392f Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-24 (Sat, 24 Dec 2016) Changed paths: M nixos/modules/config/swap.nix M nixos/modules/tasks/filesystems.nix Log Message: --- nixos: Add storage opt to fileSystems/swapDevices References a partition, disk, volume or whatever you like instead of using a device path or label. Creating those storage devices is done by nixpart and we can infer the right labels and/or poths from the device tree. I've added those hooks here, because duplicating things such as fsType, label, options or mountPoint in the storage configuration look kinda pointless to me. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: f0f7869c74c71c2fdc76a9f3658ffe689a81ecdf https://github.com/NixOS/nixpkgs/commit/f0f7869c74c71c2fdc76a9f3658ffe689a81ecdf Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-24 (Sat, 24 Dec 2016) Changed paths: M nixos/modules/module-list.nix A nixos/modules/tasks/storage.nix Log Message: --- nixos: Add storage module for nixpart This is not the final version, because I'm not yet sure whether we want BTRFS as a special option here. Also, we don't check types properly yet. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 9efd3013c2babec2fb03e3ffdfef98cac31ae787 https://github.com/NixOS/nixpkgs/commit/9efd3013c2babec2fb03e3ffdfef98cac31ae787 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-24 (Sat, 24 Dec 2016) Changed paths: M nixos/modules/tasks/storage.nix Log Message: --- nixos/storage: Fix missing volgroupType stub All of the types are just stubs right now, but I actually forgot volgroupType, as I didn't do tests of LVM in nixpart so far yet. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: ea8ae6a822ffbde4cde66e8fabc4487e750b3d9e https://github.com/NixOS/nixpkgs/commit/ea8ae6a822ffbde4cde66e8fabc4487e750b3d9e Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-24 (Sat, 24 Dec 2016) Changed paths: M nixos/tests/partition.nix Log Message: --- nixos/test/partition: Rewrite for nixpart 1.0 Currently, this is still WIP and subject to change, but it helps to see whether our storage configuration options actually work out the way we want. Still needs a lot of cleanup, especially regarding the -m option, where I'm not sure whether we should do it with nixpart or write our own lightweight solution to be built into NixOS. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: c4b8a02e412d55466ea41324779625a69fa14a98 https://github.com/NixOS/nixpkgs/commit/c4b8a02e412d55466ea41324779625a69fa14a98 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-24 (Sat, 24 Dec 2016) Changed paths: M nixos/release.nix R nixos/tests/partition.nix A nixos/tests/storage.nix Log Message: --- nixos/tests: Enable "partition" as "storage" Renames the test to closer match the NixOS module attribute and put it into release.nix. Of course, those tests still fail, because nixpart is still WIP and I haven't pushed the first version yet. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 4a1ac119109475b8d8c16da5ec1c2fbe1c0dc74e https://github.com/NixOS/nixpkgs/commit/4a1ac119109475b8d8c16da5ec1c2fbe1c0dc74e Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-24 (Sat, 24 Dec 2016) Changed paths: M nixos/tests/storage.nix Log Message: --- nixos/test/storage: Fix reference to kickstart We have renamed the function to nixpart() already, so let's make sure we rename it accordingly. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: d98b8468ea5b60cc49a15dd4ede028d3b11bc7ed https://github.com/NixOS/nixpkgs/commit/d98b8468ea5b60cc49a15dd4ede028d3b11bc7ed Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-24 (Sat, 24 Dec 2016) Changed paths: M nixos/tests/storage.nix Log Message: --- nixos/tests/storage: Pass storage config as XML We're internally calling nix-instantiate to get the required options from the configuration, so let's pass it through an option that skips this step. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: d4f6c45f9da97fa45e26c60947fcd2147a40b2c8 https://github.com/NixOS/nixpkgs/commit/d4f6c45f9da97fa45e26c60947fcd2147a40b2c8 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-24 (Sat, 24 Dec 2016) Changed paths: M nixos/tests/storage.nix Log Message: --- tests/storage: Don't import Let's use relative paths instead, because the version in isn't n
[Nix-commits] [NixOS/nixpkgs] 6af6ce: Revert "thin-provisioning-tools: init at 0.6.1"
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 6af6cec8b279efe864e1fd995aa95ca32bba504e https://github.com/NixOS/nixpkgs/commit/6af6cec8b279efe864e1fd995aa95ca32bba504e Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-25 (Sun, 25 Dec 2016) Changed paths: R pkgs/os-specific/linux/thin-provisioning-tools/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Revert "thin-provisioning-tools: init at 0.6.1" This reverts commit 55b18ac486336da8f9bfe352afd3fac564b2671b. There is already a "thin-provisioning-tools" package (see cd1ec18b421c3dbbaabfc64f4f5d30371f84e7e1). Although this one was committed earlier, I'm reverting it because it's not only older, but it's unreferenced within . Apart from that the packaging of the other package is of higher packaging quality (maintainer and license, doesn't use "descriptionS", uses autoreconfHook). Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @globin, @dwe11er, @jagajaga Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] c39e36: {lib}mediainfo{-gui}, libzen: 0.7.87 -> 0.7.91, 0.4...
Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: c39e36f766deda952f268791b9eb681f688296aa
https://github.com/NixOS/nixpkgs/commit/c39e36f766deda952f268791b9eb681f688296aa
Author: devhell <^@regexmail.net>
Date: 2016-12-17 (Sat, 17 Dec 2016)
Changed paths:
M pkgs/applications/misc/mediainfo-gui/default.nix
M pkgs/applications/misc/mediainfo/default.nix
M pkgs/development/libraries/libmediainfo/default.nix
M pkgs/development/libraries/libzen/default.nix
Log Message:
---
{lib}mediainfo{-gui},libzen: 0.7.87 -> 0.7.91, 0.4.33 -> 0.4.34
Unfortunately I've not been able to keep this updated on a regular basis
at the moment, therefore some versions have been skipped. I'm therefore
going to just add the link for the changelog:
https://mediaarea.net/MediaInfo/ChangeLog
Commit: 603dbfc5a9ea77e4a98e46274843139a8501deda
https://github.com/NixOS/nixpkgs/commit/603dbfc5a9ea77e4a98e46274843139a8501deda
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths:
M pkgs/applications/misc/mediainfo-gui/default.nix
M pkgs/applications/misc/mediainfo/default.nix
M pkgs/development/libraries/libmediainfo/default.nix
M pkgs/development/libraries/libzen/default.nix
Log Message:
---
Merge pull request #21236 (Update mediainfo)
This pulls updates from @devhell for libmediainfo, mediainfo,
mediainfo-gui and libzen to their latest upstream versions.
Tested by building all of these packages plus "ums" and "sonarr" (both
depend on one or more of these updated packages) on x86_64-linux.
Compare: https://github.com/NixOS/nixpkgs/compare/9f200422f28e...603dbfc5a9ea___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 5ed1ae: python/pypillowfight: Disable tests entirely
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 5ed1aee3af6ce80c63e534fc26d7ee611d4ca50d https://github.com/NixOS/nixpkgs/commit/5ed1aee3af6ce80c63e534fc26d7ee611d4ca50d Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-20 (Tue, 20 Dec 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- python/pypillowfight: Disable tests entirely This is getting entirely different results on i686-linux: https://hydra.nixos.org/build/45122757/nixlog/6/raw According to @jflesch the reference system these tests are built for is Debian GNU/Linux (possibly only x86_64-linux I guess): https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 So let's disable them until they're more deterministic and less platform/distro-specific. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] ccbce6: python/hetzner: 0.7.4 -> 0.7.5
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: ccbce6b11ab0e47c2f701f2539f989a7fd323687 https://github.com/NixOS/nixpkgs/commit/ccbce6b11ab0e47c2f701f2539f989a7fd323687 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-20 (Tue, 20 Dec 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- python/hetzner: 0.7.4 -> 0.7.5 This essentially unbreaks deploying new Hetzner machines with NixOps, because the Hetzner robot has changed its way of handling admin accounts. It also now provides a more helpful error message (instead of an AssertionError) if admin account creation has failed. Signed-off-by: aszlig <asz...@redmoonstudios.org> Reported-by: Graham Christensen <gra...@grahamc.com> Issue: https://github.com/NixOS/nixops/issues/563 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] a7d425: python/simplebayes: init at 1.5.8
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: a7d425758a1d235615f17fae5c06cb1f87a4b53c https://github.com/NixOS/nixpkgs/commit/a7d425758a1d235615f17fae5c06cb1f87a4b53c Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- python/simplebayes: init at 1.5.8 The upstream tag actually says 1.5.7 but the commit actually bumps the version to 1.5.8: https://github.com/hickeroar/simplebayes/commit/b8da72c50d20b6f8c0d We needed to patch the setup.py because the upstream project's setup.py reads in the README.rst for the longDescription. That very README.rst contains non-ASCII characters which in turn throws a decoding error with Python 3 on Nix because I think this has to do with our setup.py wrapper that doesn't seem to recognize the right encoding when using compile(). Tested by building against Python 2.7, 3.3, 3.4, 3.5 and 3.6. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 0409ce23303a0b194a10c1cb81971a03066d7770 https://github.com/NixOS/nixpkgs/commit/0409ce23303a0b194a10c1cb81971a03066d7770 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- python/pyinsane2: init at 2.0.9 The tests require a scanner to be physically attached. Quote from the upstream README: > Tests require at least one scanner with a flatbed and an ADF > (Automatic Document Feeder). > > If possible, they should be run with at least 2 scanners connected. > The first that appear in "scanimage -L" must be the one with the ADF. > > For reference, my current setup is: > > - HP Officejet 4620 (Flatbed + ADF) > - HP Deskjet 2050 J510 series (Flatbed) So we disable the tests even though it might be theoretically possible to use qemu and an emulated scanner. Instead of the upstream tests we just do a quick check whether initialization of the library succeeds. Other than that the library uses ctypes.cdll to dlopen() the libsane shared library, so we need to patch in the right store path. Tested by building against Python 2.7, 3.3, 3.4, 3.5 and 3.6. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: f805209a78a1a38cc13c9deac72a6433b6f5ba7b https://github.com/NixOS/nixpkgs/commit/f805209a78a1a38cc13c9deac72a6433b6f5ba7b Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: M pkgs/development/libraries/poppler/default.nix M pkgs/top-level/all-packages.nix Log Message: --- poppler: Add support for gobject-introspection This optionally adds support for GI, because it's needed for paperwork-backend. The new poppler_gi attribute is also marked as lowPrio so that users won't accidentally install it. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @ttuegel Commit: 68bc260ca2d71a676dd6afdb3524d4fff483016b https://github.com/NixOS/nixpkgs/commit/68bc260ca2d71a676dd6afdb3524d4fff483016b Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: M nixos/lib/testing.nix M pkgs/applications/graphics/tesseract/default.nix Log Message: --- tesseract: 3.02.02 -> 3.04.01 >From the upstream changelog: * Tesseract development is now done with Git and hosted at github.com (Previously we used Subversion as a VCS and code.google.com for hosting). So let's move over to the GitHub repository, where the organisation also includes a full repository for tessdata, so we no longer need to fetch it one-by-one. The build also got significantly simpler, because we no longer need to run autoconf, neither do we need to patch the configure script for Leptonica headers. This also has the advantage that we don't need to use the enableLanguages attribute for the test runner anymore. Full upstream changelog can be found at: https://github.com/tesseract-ocr/tesseract/blob/c4d273d33cc36e/ChangeLog Tested against all NixOS tests with enabled OCR (chromium, emacs-daemon, installer.luksroot and lightdm). Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @viric Commit: 02a9da65c9640bd9f61f03d594a360d18541bfad https://github.com/NixOS/nixpkgs/commit/02a9da65c9640bd9f61f03d594a360d18541bfad Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-19 (Mon, 19 Dec 2016) Changed paths: M nixos/tests/kde5.nix M nixos/tests/sddm.nix Log Message: --- nixos: Disable OCR for tests that do not use it Found out during testing of the Tesseract upgrade the kde5 and sddm tests don't actually use OCR, so let's disable support for it. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @ttuegel Commit: e186a8dba99ddb14389018e5a1e842dc9155b3fc
[Nix-commits] [NixOS/nixpkgs] ffe71c: kexec-tools: Add patch to fix build on ARM
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: ffe71cbe19508320ed9820e1b8caee732d5d9ddf https://github.com/NixOS/nixpkgs/commit/ffe71cbe19508320ed9820e1b8caee732d5d9ddf Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-18 (Sun, 18 Dec 2016) Changed paths: A pkgs/os-specific/linux/kexectools/arm.patch M pkgs/os-specific/linux/kexectools/default.nix Log Message: --- kexec-tools: Add patch to fix build on ARM Building on ARM fails with the following error: kexec/arch/arm/phys_to_virt.o kexec/arch/arm/phys_to_virt.c kexec/arch/arm/phys_to_virt.c:3:26: fatal error: phys_to_virt.h: No such file or directory The patch I'm using is from Fedora: http://pkgs.fedoraproject.org/cgit/rpms/kexec-tools.git/tree/kexec-tools-2.0.13-fix-armv7-build-failure.patch?id=97581f1a435aafa298a4d0bbcfaf40c63a41ce92 It has been reported upstream as well: http://lists.infradead.org/pipermail/kexec/2016-September/017352.html I'm adding the patch for all architectures, so that the next person to upgrade kexec-tools doesn't forget that even while on x86. Tested building with i686-linux, x86_64-linux and armv7l-linux. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 2fe1da: cython: 0.25.1 -> 0.25.2
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 2fe1daf804d652962aa16e765894766365ae2909 https://github.com/NixOS/nixpkgs/commit/2fe1daf804d652962aa16e765894766365ae2909 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-18 (Sun, 18 Dec 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- cython: 0.25.1 -> 0.25.2 Upstream changelog without issue numbers: * Fixes several issues with C++ template deduction. * Fixes a issue with bound method type inference. * Fixes a bug with cascaded tuple assignment. * Fixed or silenced many Clang warnings. * Fixes bug with powers of pure real complex numbers. The full changelog with issue numbers can be found here: https://github.com/cython/cython/blob/0.25.2/CHANGES.rst My main reason for updating is because there were test failures on i686-linux, although version 0.25.2 still has one test that fails. So if we're on i686-linux and on Python 2 we just fix that one little doctest. The test failure has already been reported upstream at: https://github.com/cython/cython/issues/1548 All of the failing tests (including the latter) had to do with integer representations in that long integers are suffixed by an L while the test cases weren't expecting this. Built successfully on i686-linux and x86_64-linux against Python 2.7 and Python 3.5. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 38ea64: qemu_test: Make chown() calls to the store a no-op
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 38ea64e86793342b1384a71ae07f0088d9cd891f https://github.com/NixOS/nixpkgs/commit/38ea64e86793342b1384a71ae07f0088d9cd891f Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-16 (Fri, 16 Dec 2016) Changed paths: M pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch Log Message: --- qemu_test: Make chown() calls to the store a no-op The "misc" NixOS test is using Nix to query the store and it tries to change the ownership of it while doing so. This fails if Nix is not in a seccomp-sandboxed userid namespace, so let's make chown() a no-op when applied to store paths. Fixes the misc test (and possibly future tests) on older Nix versions. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 147142: nixos/test-instrumentation: Fix eval of boot tests
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 147142674992c29025b50f9818d7ac104e0de223 https://github.com/NixOS/nixpkgs/commit/147142674992c29025b50f9818d7ac104e0de223 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-15 (Thu, 15 Dec 2016) Changed paths: M nixos/modules/testing/test-instrumentation.nix Log Message: --- nixos/test-instrumentation: Fix eval of boot tests The boot tests import test-instrumentation.nix directly to create a VM image that only contains things such as the backdoor and serial console the same way as used by other NixOS VM tests. With one difference though: It doesn't need nor want to have 9p filesystems mounted, because we actually want to test an image rather than re-using most stuff from the host's store. Change tested against the boot.uefiUsb and ipv6 tests, just that it becomes clear we don't break either the tests with 9p nor the boot tests (which were already broken but now succeed). Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 5075a1: nixos/tests: Use a patched QEMU for testing
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: 5075a1a81a2bddfdaf93a37a80d87ebe5760b792 https://github.com/NixOS/nixpkgs/commit/5075a1a81a2bddfdaf93a37a80d87ebe5760b792 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-15 (Thu, 15 Dec 2016) Changed paths: M nixos/modules/testing/test-instrumentation.nix M nixos/modules/virtualisation/qemu-vm.nix M pkgs/applications/virtualization/qemu/default.nix A pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch M pkgs/top-level/all-packages.nix Log Message: --- nixos/tests: Use a patched QEMU for testing The reason to patch QEMU is that with latest Nix, tests like "printing" or "misc" fail because they expect the store paths to be owned by uid 0 and gid 0. Starting with NixOS/nix@5e51ffb1c265e16486fcdd888ce4a04db9e5552b, Nix builds inside of a new user namespace. Unfortunately this also means that bind-mounted store paths that are part of the derivation's inputs are no longer owned by uid 0 and gid 0 but by uid 65534 and gid 65534. This in turn causes things like sudo or cups to fail with errors about insecure file permissions. So in order to avoid that, let's make sure the VM always gets files owned by uid 0 and gid 0 and does a no-op when doing a chmod on a store path. In addition, this adds a virtualisation.qemu.program option so that we can make sure that we only use the patched version if we're *really* running NixOS VM tests (that is, whenever we have imported test-instrumentation.nix). Tested against the "misc" and "printing" tests. Signed-off-by: aszlig <asz...@redmoonstudios.org> (cherry picked from commit 6cfb3b636418526d1c49d14316a127133cf09c9d) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 1f9cbc: beets: Set Python version via top-level attribute
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 1f9cbcd21de891540139bbb86faa4b14ce23bd15 https://github.com/NixOS/nixpkgs/commit/1f9cbcd21de891540139bbb86faa4b14ce23bd15 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M pkgs/tools/audio/beets/default.nix M pkgs/top-level/all-packages.nix Log Message: --- beets: Set Python version via top-level attribute This largely reverts commit 599312739e3a338f923e6c22ab183178ca49c7b6. The main reason is that it breaks the plugins, because the mentioned commit didn't change the attributes for the plugins as well. But instead of just fixing the attributes when we import the plugin packages, let's just override pythonPackages in all-packages.nix. Right now, Beets is in transition to Python 3, so we don't need to wait that long until we can remove the dependency on Python 2: https://github.com/beetbox/beets/releases/tag/v1.4.1 Once Python 3 support is no longer beta, we can just change this by changing one line only instead of several. Tested this by building beets with both external plugins. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @FRidh ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 6343fe: python/pillow: Only disable failing tests
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 6343fef5469863d99208a336048cc2a8cba9dd52 https://github.com/NixOS/nixpkgs/commit/6343fef5469863d99208a336048cc2a8cba9dd52 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- python/pillow: Only disable failing tests There's no reason to disable ALL tests just because only one particular test module is failing. Tested on i686-linux and x86_64-linux against these Python versions: Python 2.6: The interpreter itself doesn't build Python 2.7: Successful for both architectures Python 3.3: Successful for both architectures Python 3.4: Successful for both architectures Python 3.5: Successful for both architectures Python 3.6: One of the dependencies of pillow doesn't build (pytest) Tests for PyPy still fail, which is why the doCheck attribute is only set to false if we're building for PyPy. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @desiderius, @goibhniu, @prikhi Commit: a76f5241c565afce7ca7843f5eaee40d87021451 https://github.com/NixOS/nixpkgs/commit/a76f5241c565afce7ca7843f5eaee40d87021451 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: A pkgs/applications/graphics/vimiv/default.nix A pkgs/applications/graphics/vimiv/fixes.patch M pkgs/top-level/all-packages.nix Log Message: --- vimiv: init at 0.7.2 Packaging itself is pretty much straightforward, the tests however revealed a few issues, which I have fixed with a small patch that has been upstreamed at https://github.com/karlch/vimiv/pull/32. The other sed-based patches in postPatch are mostly NixOS-specific. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/4f8b74b4015d...a76f5241c565___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 7a8da5: gn: Init at 0.0.0.20161008
Branch: refs/heads/release-16.09
Home: https://github.com/NixOS/nixpkgs
Commit: 7a8da54873cd01d6cb7bd9ada88d0df95cde6bf4
https://github.com/NixOS/nixpkgs/commit/7a8da54873cd01d6cb7bd9ada88d0df95cde6bf4
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
A pkgs/development/tools/build-managers/gn/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
---
gn: Init at 0.0.0.20161008
This is the standalone version of GN used currently solely for building
Chromium. An upstream bug report is available at
https://crbug.com/504074 to support a standalone build without needing
various components from the Chromium source tree.
Because there isn't a standalone vrsion available, I'm choosing
0.0.0.${date} as the version scheme here so that we don't conflict with
versioned releases from upstream someday[TM].
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: fcebe37b4b5a71989a1f68e2595a01a9b7563d4c
https://github.com/NixOS/nixpkgs/commit/fcebe37b4b5a71989a1f68e2595a01a9b7563d4c
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
A pkgs/applications/networking/browsers/chromium/common-gn.nix
M pkgs/applications/networking/browsers/chromium/default.nix
Log Message:
---
chromium: Add preliminary support for GN
This only uses the most basic GN flags which should represent the GYP
flags we had before. In order to get rid most of the GYP cruft, we now
have common.nix and common-gn.nix which are mostly the same, just that
the latter is only for GN builds.
The GN implementation is far from complete and currently not even
builds, so we need more work to get the beta and dev channels building.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 37fabe5cce2e7d427b40cb9d75ff2f4e9eb9ce2c
https://github.com/NixOS/nixpkgs/commit/37fabe5cce2e7d427b40cb9d75ff2f4e9eb9ce2c
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M pkgs/applications/networking/browsers/chromium/common-gn.nix
M pkgs/applications/networking/browsers/chromium/common.nix
R
pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch
Log Message:
---
chromium: Remove plugin paths patch for version 50
The oldest version we build is version 53, so we no longer need this
patch.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: f8d709244103dd6d90630b98e749f7c5a0ad2d4b
https://github.com/NixOS/nixpkgs/commit/f8d709244103dd6d90630b98e749f7c5a0ad2d4b
Author: Herwig Hochleitner <her...@bendlas.net>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M pkgs/applications/networking/browsers/chromium/upstream-info.nix
Log Message:
---
chromium: 53 -> 54
Commit: 725888e7b4e4e8bbd164cb2881f0ff5dc474afe4
https://github.com/NixOS/nixpkgs/commit/725888e7b4e4e8bbd164cb2881f0ff5dc474afe4
Author: Herwig Hochleitner <her...@bendlas.net>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M pkgs/applications/networking/browsers/chromium/default.nix
M pkgs/applications/networking/browsers/chromium/plugins.nix
Log Message:
---
chromium: remove pepperflash
fixes NixOS#19565
Commit: b431ae588a29d13db7223912cd5de1a6f58fc3b9
https://github.com/NixOS/nixpkgs/commit/b431ae588a29d13db7223912cd5de1a6f58fc3b9
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M pkgs/applications/networking/browsers/chromium/common-gn.nix
M pkgs/applications/networking/browsers/chromium/common.nix
M pkgs/applications/networking/browsers/chromium/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
---
chromium: Remove flag for hiDPISupport
This should now be the upstream default and there also is no more flag
for GN to set it, so we'll no longer need it on our side as well.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 469fbdeff312005eb144b43d1dbbbafa4bf6d4f4
https://github.com/NixOS/nixpkgs/commit/469fbdeff312005eb144b43d1dbbbafa4bf6d4f4
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
R pkgs/applications/networking/browsers/chromium/common-gn.nix
M pkgs/applications/networking/browsers/chromium/common.nix
M pkgs/applications/networking/browsers/chromium/default.nix
Log Message:
---
chromium: Build with GN unconditionally
Previously I've added the extra file common-gn.nix in addition to
common.nix, so we can possibly have a smooth transition from current
stable to the new version 54.
Unfortunately, version 53 is already EOL and we have to move to version
54 as soon as possible so we can only use GN and thus it doesn't make
sense to provide expressio
[Nix-commits] [NixOS/nixpkgs] 3d4b62: nixos/stage1: Fix local keyword outside function
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 3d4b6257d666149991a4c718601bd834cf100b79 https://github.com/NixOS/nixpkgs/commit/3d4b6257d666149991a4c718601bd834cf100b79 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-10-28 (Fri, 28 Oct 2016) Changed paths: M nixos/modules/system/boot/stage-1-init.sh Log Message: --- nixos/stage1: Fix local keyword outside function Thanks to @NeQuissimus in a5c1985fef381b1fb5d75d3b4028ed5b5d4454b3 for updating busybox, which since version 1.25 doesn't allow local variables outside of functions anymore (which is the desired behaviour). See the following upstream commit of busybox which is the change that let's this problem surface: https://git.busybox.net/busybox/commit/?id=ef2386b80abfb22ccb697ddbdd4047aacc395c50 So this has been an error I've made on my end in 67223ee205364afb203361b134f16b890c4d726c, because I originally had a function for killing the processes but desired to inline it because it's only used in one place. This fixes the boot-stage1 NixOS test. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 240638: quassel-webserver: Remove reference to
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 2406387fd6312beebc0800bd347d10dd1178e9a8 https://github.com/NixOS/nixpkgs/commit/2406387fd6312beebc0800bd347d10dd1178e9a8 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-10-23 (Sun, 23 Oct 2016) Changed paths: M pkgs/applications/networking/irc/quassel-webserver/default.nix Log Message: --- quassel-webserver: Remove reference to We already are in the repository and using within its own tree will depend on to be set in NIX_PATH, otherwise the evaluation will fail. So apart from this issue it isn't even necessary to use instead of the relative path to node-packages.nix, so let's use the latter. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @uwap, @Mic92 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 09d349: buildLinux/linuxManualConfig: Allow .override
Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 09d349328255660c6e29d37d8e795b004e002226
https://github.com/NixOS/nixpkgs/commit/09d349328255660c6e29d37d8e795b004e002226
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M pkgs/top-level/all-packages.nix
Log Message:
---
buildLinux/linuxManualConfig: Allow .override
Regression introduced by da36847d925058fd86f027b64cc712c57be11ad8.
The kernelPackages NixOS module option now uses .override to add kernel
patches defined in boot.kernelPatches into the kernel within the
kernelPackages set.
For generic kernels, we already have an .override which comes with
callPackage, but pkgs.linuxManualConfig is a function where we want to
override the attributes passed to it.
The callPackage to manual-config.nix only allows us to override its
internal attributes but not the attributes of the function returned.
Simplified it looks like this:
.- .override provided by
__|__callPackage
| |
(callPackage .../manual-config.nix { ... }) { ... }
|_|
|
the one -'
we actually want to override
Signed-off-by: aszlig <asz...@redmoonstudios.org>
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] aeec1b: tests/boot-stage1: Use runCommandCC for kcanary
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: aeec1bc5c8619833bdb78c7484821079726acf37 https://github.com/NixOS/nixpkgs/commit/aeec1bc5c8619833bdb78c7484821079726acf37 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-10-09 (Sun, 09 Oct 2016) Changed paths: M nixos/tests/boot-stage1.nix Log Message: --- tests/boot-stage1: Use runCommandCC for kcanary Since 97bfc2fac92d90c668ae1ec078356d0bd0a9ddb7, runCommand doesn't include a compiler anymore. So let's switch to the new runCommandCC, which resembles the old state. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] bc6cae: chromium: Fix wrong hash for beta channel
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: bc6caeabccf7de07c46d86edefa2583302b9c11f https://github.com/NixOS/nixpkgs/commit/bc6caeabccf7de07c46d86edefa2583302b9c11f Author: aszlig <asz...@redmoonstudios.org> Date: 2016-10-09 (Sun, 09 Oct 2016) Changed paths: M pkgs/applications/networking/browsers/chromium/upstream-info.nix Log Message: --- chromium: Fix wrong hash for beta channel It seems that upstream has re-uploaded the tarball again (see 0c2683cc110659d57e36329585469d5d653a0817). I've verified the new hash from two different hosts. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 552651: nixos/lib/testing: Fix unsetting $xchg
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: 5526517da91e0aa719c672b54479182e896db716 https://github.com/NixOS/nixpkgs/commit/5526517da91e0aa719c672b54479182e896db716 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-10-01 (Sat, 01 Oct 2016) Changed paths: M nixos/lib/testing.nix Log Message: --- nixos/lib/testing: Fix unsetting $xchg Regression introduced by 4dcb685af940efd74a7b2b66ae917129ef232d83. Unsetting the environment variable shortly before using it is not going to end up very well, so let's just filter out the variable from the output of export and unset it shortly afterwards. This fixes the runInMachine NixOS test. Signed-off-by: aszlig <asz...@redmoonstudios.org> (cherry picked from commit b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 900a04: beets: Use pythonPackages.buildPythonApplication
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 900a04e6c9953fbdc59d4a51bef8283594357d28 https://github.com/NixOS/nixpkgs/commit/900a04e6c9953fbdc59d4a51bef8283594357d28 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M pkgs/tools/audio/beets/alternatives-plugin.nix M pkgs/tools/audio/beets/copyartifacts-plugin.nix M pkgs/tools/audio/beets/default.nix Log Message: --- beets: Use pythonPackages.buildPythonApplication The top-level attribute has been removed in commit 771ed59b48bc1257439b4529426cc9047aebc27b. This has been partially resolved in commit 18bdd44729a4e3d58220ed4789a91aabd20470dd. The latter change however only addressed the main derivations but missed out on the plugins. This is now done by just passing pythonPackages down the chain. Tested by only evaluating the expression, not building. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @domenkozar, @pjones, @profpatsch ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 2af705: nixos/offlineimap: Move to services/mail
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 2af70511974a79814e88c35d0172be5d502ec0c3 https://github.com/NixOS/nixpkgs/commit/2af70511974a79814e88c35d0172be5d502ec0c3 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M nixos/modules/module-list.nix A nixos/modules/services/mail/offlineimap.nix R nixos/modules/services/networking/offlineimap.nix Log Message: --- nixos/offlineimap: Move to services/mail The services/networking directory is already quite polluted and the first point where I was looking for the offlineimap module was in services/mail and didn't find it there. Offlineimap already has IMAP in its name and clearly belongs to the "mail" category so let's move it there. Tested by evaluating a configuration with services.offlineimap enabled. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @DamienCassou ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 603b73: nixos/offlineimap: Don't build the package on eval
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 603b73f1e13399730648374d78d63d715d6bb617 https://github.com/NixOS/nixpkgs/commit/603b73f1e13399730648374d78d63d715d6bb617 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M nixos/modules/services/networking/offlineimap.nix Log Message: --- nixos/offlineimap: Don't build the package on eval Coercing the derivation to string causes the package to be built during evaluation rather than during actual realization which is completely unnecessary because we don't need additional Nix expression information for the package (nor do we need it for the service). Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @DamienCassou Cc: @Profpatsch (stumbled on this because of him) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] f94ea0: nixos/activation: Avoid remounting non-existing FS
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: f94ea04805845d1d98e2a9ff1342c3aad196d3a1 https://github.com/NixOS/nixpkgs/commit/f94ea04805845d1d98e2a9ff1342c3aad196d3a1 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M nixos/modules/system/activation/activation-script.nix Log Message: --- nixos/activation: Avoid remounting non-existing FS Regression introduced by 79d4636d506094eae3c5c7575a0bef817cba9bda. The mentioned commit moves /run/keys from stage 2 to boot.specialFileSystems, the latter being remounted during system activation. Unfortunately, the specialMount function in the activation script does this unconditionally and thus will fail if it can't be remounted because the mount point simply doesn't exist. We now check the mount point for existance and only remount if it exists but mkdir + mount it if it doesn't. Tested against the "simple" NixOS installer test. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: cb2f84e4d70772804d723b10cc2469bfcd658488 https://github.com/NixOS/nixpkgs/commit/cb2f84e4d70772804d723b10cc2469bfcd658488 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M nixos/modules/config/networking.nix M nixos/modules/system/activation/activation-script.nix Log Message: --- nixos/activation: Rename "tmpfs" to "specialfs" Using "tmpfs" as a script part for system.activationScripts is a bit misleading since 6efcfe03ae4ef426b77a6827243433b5296613a4. We no longer solely mount tmpfs within this script, so using "specialfs" fits more nicely in terms of naming. Tested against the "simple" NixOS installer test. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/8967a3f7981a...cb2f84e4d707___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 135d6f: chromium: Fix wrong/missing hash for beta channel
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: 135d6f2aa67bea1f65e3769a273af1a470c671fb https://github.com/NixOS/nixpkgs/commit/135d6f2aa67bea1f65e3769a273af1a470c671fb Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-25 (Sun, 25 Sep 2016) Changed paths: M pkgs/applications/networking/browsers/chromium/upstream-info.nix Log Message: --- chromium: Fix wrong/missing hash for beta channel The hash provided in commit 072917ea5d94a3d52901a46a5c7702eb82e93a30 is faulty, either because the upstream tarball has changed or because it was wrong in the first place, no matter what happened we can't really verify if we don't have the tarball with the old hash. To double-check I've verified the hash against the one from Gentoo[1], which has the following SHA256: b46c26a9e773b2c620acd2f96d69408f14a279aefaedfefed002ecf898a1ecf2 After being converted into base 32 the hash does match with ours. Note that I haven't tested building all Chromium channels (yet), but we can fix upcoming issues later because right now it doesn't build anyway because of the failing hash check. [1]: https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/Manifest?id=2de0f5e4ffeb46a478c589b21d5bbcfd5736e57b Signed-off-by: aszlig <asz...@redmoonstudios.org> (cherry picked from commit 0c2683cc110659d57e36329585469d5d653a0817) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 0c2683: chromium: Fix wrong/missing hash for beta channel
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 0c2683cc110659d57e36329585469d5d653a0817 https://github.com/NixOS/nixpkgs/commit/0c2683cc110659d57e36329585469d5d653a0817 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-25 (Sun, 25 Sep 2016) Changed paths: M pkgs/applications/networking/browsers/chromium/upstream-info.nix Log Message: --- chromium: Fix wrong/missing hash for beta channel The hash provided in commit 072917ea5d94a3d52901a46a5c7702eb82e93a30 is faulty, either because the upstream tarball has changed or because it was wrong in the first place, no matter what happened we can't really verify if we don't have the tarball with the old hash. To double-check I've verified the hash against the one from Gentoo[1], which has the following SHA256: b46c26a9e773b2c620acd2f96d69408f14a279aefaedfefed002ecf898a1ecf2 After being converted into base 32 the hash does match with ours. Note that I haven't tested building all Chromium channels (yet), but we can fix upcoming issues later because right now it doesn't build anyway because of the failing hash check. [1]: https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/Manifest?id=2de0f5e4ffeb46a478c589b21d5bbcfd5736e57b Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 9f765f: nixos/networking: Use type lines for localCommands
Branch: refs/heads/release-16.03 Home: https://github.com/NixOS/nixpkgs Commit: 9f765f928bc91dc4b2523bb9f703d40fc663286a https://github.com/NixOS/nixpkgs/commit/9f765f928bc91dc4b2523bb9f703d40fc663286a Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M nixos/modules/tasks/network-interfaces.nix Log Message: --- nixos/networking: Use type lines for localCommands Using types.str doesn't work if you want to mkBefore/mkAfter across different module definitions, because it only allows for one definition for the same priority. This is especially useful if you deploy Hetzner machines via NixOps, because the physical specification already defines localCommands. Signed-off-by: aszlig <asz...@redmoonstudios.org> (cherry picked from commit 97801380b05447e59e47ba97d93f6c6cfefd56e4) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 4d076b: nixos/networking: Use type lines for localCommands
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: 4d076b3681050383675ad624b762886c02f02b14 https://github.com/NixOS/nixpkgs/commit/4d076b3681050383675ad624b762886c02f02b14 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M nixos/modules/tasks/network-interfaces.nix Log Message: --- nixos/networking: Use type lines for localCommands Using types.str doesn't work if you want to mkBefore/mkAfter across different module definitions, because it only allows for one definition for the same priority. This is especially useful if you deploy Hetzner machines via NixOps, because the physical specification already defines localCommands. Signed-off-by: aszlig <asz...@redmoonstudios.org> (cherry picked from commit 97801380b05447e59e47ba97d93f6c6cfefd56e4) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 978013: nixos/networking: Use type lines for localCommands
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 97801380b05447e59e47ba97d93f6c6cfefd56e4 https://github.com/NixOS/nixpkgs/commit/97801380b05447e59e47ba97d93f6c6cfefd56e4 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M nixos/modules/tasks/network-interfaces.nix Log Message: --- nixos/networking: Use type lines for localCommands Using types.str doesn't work if you want to mkBefore/mkAfter across different module definitions, because it only allows for one definition for the same priority. This is especially useful if you deploy Hetzner machines via NixOps, because the physical specification already defines localCommands. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] dc364e: nixos/xfce: Fix reference to Gtk 2
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: dc364e8b18484eb2d2782ac92c92a2b7ecadc735 https://github.com/NixOS/nixpkgs/commit/dc364e8b18484eb2d2782ac92c92a2b7ecadc735 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M nixos/modules/services/x11/desktop-managers/xfce.nix Log Message: --- nixos/xfce: Fix reference to Gtk 2 Regression introduced by bccd75094fd5108b3d834ad3a86e056eed3b0337. The mentioned commit removed the pkgs.gtk attribute, but forgot to change this within the xfce module. Tested using the xfce NixOS test and it has passed on my machine. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] e85e51: nixos/pam: Fix wrong string concatenation
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: e85e51d41f0f3be40490b0de9a76f20f3685659c https://github.com/NixOS/nixpkgs/commit/e85e51d41f0f3be40490b0de9a76f20f3685659c Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M nixos/modules/security/pam.nix Log Message: --- nixos/pam: Fix wrong string concatenation Regression introduced by 1010271c63f503113c0e8337977610ea783880ec. This caused the line after using the loginuid module to be concatenated with the next line without a newline. In turn this has caused a lot of the NixOS VM tests to either run very slowly (because of constantly hitting PAM errors) or simply fail. I have tested this only with one of the failing NixOS tests. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 7f0e4a: Merge pull request #18567 (VirtualBox 5.1.6)
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: 7f0e4a8d230d6b249b8d30e114ce2ebd87cd4726 https://github.com/NixOS/nixpkgs/commit/7f0e4a8d230d6b249b8d30e114ce2ebd87cd4726 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-14 (Wed, 14 Sep 2016) Changed paths: M nixos/doc/manual/release-notes/rl-1609.xml M nixos/modules/virtualisation/virtualbox-host.nix M nixos/modules/virtualisation/virtualbox-image.nix M nixos/tests/virtualbox.nix M pkgs/applications/virtualization/virtualbox/default.nix M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix A pkgs/applications/virtualization/virtualbox/libressl.patch A pkgs/applications/virtualization/virtualbox/qtx11extras.patch A pkgs/applications/virtualization/virtualbox/update.py A pkgs/applications/virtualization/virtualbox/upstream-info.json A pkgs/os-specific/linux/virtualbox/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Merge pull request #18567 (VirtualBox 5.1.6) This introduces VirtualBox version 5.1.6 along with a few refactored stuff, notably: * Kernel modules and user space applications are now separate derivations. * If config.pulseaudio doesn't exist in nixpkgs config, the default is now to build with PulseAudio modules. * A new updater to keep VirtualBox up to date. All subtests in nixos/tests/virtualbox.nix succeed on my machine and VirtualBox was reported to be working by @DamienCassou (although with unrelated audio problems for another fix/branch) and @calbrecht. (cherry picked from commit 1781e955779397e4c39d406909823841210df962) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 294281: virtualbox: 5.0.26 -> 5.1.4
Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 294281596833b8d83ba90c03b792d31b868f46d7
https://github.com/NixOS/nixpkgs/commit/294281596833b8d83ba90c03b792d31b868f46d7
Author: Christian Albrecht <christian.albre...@mayflower.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M pkgs/applications/virtualization/virtualbox/default.nix
M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
A pkgs/applications/virtualization/virtualbox/libressl.patch
Log Message:
---
virtualbox: 5.0.26 -> 5.1.4
Commit: f5ab9c81a8b00ee1f96f85b0b22a549305cf10a2
https://github.com/NixOS/nixpkgs/commit/f5ab9c81a8b00ee1f96f85b0b22a549305cf10a2
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-09-13 (Tue, 13 Sep 2016)
Changed paths:
A pkgs/applications/virtualization/virtualbox/update.py
Log Message:
---
virtualbox: Add an update script
Just a small updater which should fetch the latest sha256sums from the
upstream site and check whether the current version is the latest one.
The output is in a JSON file in the same directory, which then will be
used by the Nix expressions to fetch the upstream files.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 6d69293f26ff57a2621b299409af814ba7226413
https://github.com/NixOS/nixpkgs/commit/6d69293f26ff57a2621b299409af814ba7226413
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-09-13 (Tue, 13 Sep 2016)
Changed paths:
M pkgs/applications/virtualization/virtualbox/default.nix
M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
A pkgs/applications/virtualization/virtualbox/upstream-info.json
Log Message:
---
virtualbox: Generate and use upstream-info.json
We now no longer need to update VirtualBox manually, which has a few
advantages. Along with making it just easier to update this also makes
the update procedure way less error-prone, for example if people forget
to bump the extension pack revision or to update the guest additions.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 8bd89c922d527a60d5511a1d8c9d080321478da6
https://github.com/NixOS/nixpkgs/commit/8bd89c922d527a60d5511a1d8c9d080321478da6
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-09-13 (Tue, 13 Sep 2016)
Changed paths:
M nixos/modules/virtualisation/virtualbox-host.nix
M pkgs/applications/virtualization/virtualbox/default.nix
A pkgs/os-specific/linux/virtualbox/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
---
virtualbox: Split kernel modules into own package
Putting the kernel modules into the same output path as the main
VirtualBox derivation causes all of VirtualBox to be rebuilt on every
single kernel update.
The build process of VirtualBox already outputs the kernel module source
along with the generated files for the configuration of the main
VirtualBox package. We put this into a different output called "modsrc"
which we re-use from linuxPackages.virtualbox, which is now only
containing the resulting kernel modules without the main user space
implementation.
This not only has the advantage of decluttering the Nix expression for
the user space portions but also gets rid of the need to nuke references
and the need to patch out "depmod -a".
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: d2af4c67228a28b3df3016ca216f48f6d139a62e
https://github.com/NixOS/nixpkgs/commit/d2af4c67228a28b3df3016ca216f48f6d139a62e
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-09-13 (Tue, 13 Sep 2016)
Changed paths:
M pkgs/applications/virtualization/virtualbox/default.nix
A pkgs/applications/virtualization/virtualbox/qtx11extras.patch
Log Message:
---
virtualbox: Explicitly state Qt 5 dependencies
In 294281596833b8d83ba90c03b792d31b868f46d7, the dependencies for Qt 5
were passed using buildEnv with all the development binaries, headers
and libs. Unfortunately, the build output references that environment
which also increases the size of the runtime closure.
The upstream makefile assumes a common Qt 5 library path, but that's not
the case within Nix, because we have separate paths for the Qt 5
modules.
We now patch the makefile to recognize PATH_QT5_X11_EXTRAS_{LIB,INC} so
that we can pass in the relevant paths from Qt5X11Extras.
In summary, the closure size goes down to 525559600 bytes (501 MB)
instead of 863035544 bytes (823 MB) with vbox-qt5-env.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 4a44eca07d5da2adc162b727a2ca0683aa29c45d
https://github.com/NixOS/nixpkgs/commit/4a44eca07d5da2adc162b727a2ca0683aa29c45d
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-09-13 (Tue, 13 Sep 2016)
Changed paths:
M nixos/doc/manual/release-notes/rl-1609.xml
L
[Nix-commits] [NixOS/nixpkgs] b4e2b6: nixos/lib/testing: Fix unsetting $xchg
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4 https://github.com/NixOS/nixpkgs/commit/b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-11 (Sun, 11 Sep 2016) Changed paths: M nixos/lib/testing.nix Log Message: --- nixos/lib/testing: Fix unsetting $xchg Regression introduced by 4dcb685af940efd74a7b2b66ae917129ef232d83. Unsetting the environment variable shortly before using it is not going to end up very well, so let's just filter out the variable from the output of export and unset it shortly afterwards. This fixes the runInMachine NixOS test. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 4ac7b7: nixos/modules/rename: Remove docker-registry
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82 https://github.com/NixOS/nixpkgs/commit/4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-11 (Sun, 11 Sep 2016) Changed paths: M nixos/modules/rename.nix Log Message: --- nixos/modules/rename: Remove docker-registry This is a follow-up to 9c1cdedcba2fd5233c71f0988d2eb725cc8f32ad and fed3501b0722e187284f9f6e1532f5b6e0572d6e. Discussion: https://github.com/NixOS/nixpkgs/issues/18209#issuecomment-245968857 Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @domenkozar Issue: #18209 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 1db685: nixos/stage2: Fix mounting special filesystems
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: 1db685796f77a2163b7a1126702c1ed6a06f0aeb https://github.com/NixOS/nixpkgs/commit/1db685796f77a2163b7a1126702c1ed6a06f0aeb Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M nixos/modules/system/boot/stage-2-init.sh Log Message: --- nixos/stage2: Fix mounting special filesystems This partially reverts commit ab9537ca22ce3fd4efc1795c58105504022d0c48. >From the manpage of systemd-nspawn(1): Note that systemd-nspawn will mount file systems private to the container to /dev, /run and similar. Testing this in a shell turns out: $ sudo systemd-nspawn --bind-ro=/nix/store "$(readlink "$(which ls)")" /proc Spawning container aszlig on /home/aszlig. Press ^] three times within 1s to kill container. /etc/localtime does not point into /usr/share/zoneinfo/, not updating container timezone. 1 execdomains kpageflagsstat acpi fb loadavg swaps asound filesystems locks sys buddyinfo fs meminfo sysrq-trigger businterrupts misc sysvipc cgroupsiomemmodules thread-self cmdlineioports mountstimer_list config.gz irq mtrr timer_stats consoles kallsyms net tty cpuinfokcorepagetypeinfo uptime crypto key-userspartitionsversion deviceskeys scsi vmallocinfo diskstats kmsg self vmstat dmakpagecgroup slabinfo zoneinfo driver kpagecount softirqs Container aszlig exited successfully. So the test on whether PID 1 exists in /proc is enough, because if we use PID namespaces there actually _is_ a PID 1 (as shown above) and the special file systems are already mounted. A test on the $containers variable actually mounts them twice. This unbreaks NixOS containers and I've tested this against the containers-imperative NixOS test. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @rickynils, @shlevy, @edolstra (cherry picked from commit dd98b6fb9f35544201ed66733af40ff822ba8c36) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] dd98b6: nixos/stage2: Fix mounting special filesystems
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: dd98b6fb9f35544201ed66733af40ff822ba8c36 https://github.com/NixOS/nixpkgs/commit/dd98b6fb9f35544201ed66733af40ff822ba8c36 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M nixos/modules/system/boot/stage-2-init.sh Log Message: --- nixos/stage2: Fix mounting special filesystems This partially reverts commit ab9537ca22ce3fd4efc1795c58105504022d0c48. >From the manpage of systemd-nspawn(1): Note that systemd-nspawn will mount file systems private to the container to /dev, /run and similar. Testing this in a shell turns out: $ sudo systemd-nspawn --bind-ro=/nix/store "$(readlink "$(which ls)")" /proc Spawning container aszlig on /home/aszlig. Press ^] three times within 1s to kill container. /etc/localtime does not point into /usr/share/zoneinfo/, not updating container timezone. 1 execdomains kpageflagsstat acpi fb loadavg swaps asound filesystems locks sys buddyinfo fs meminfo sysrq-trigger businterrupts misc sysvipc cgroupsiomemmodules thread-self cmdlineioports mountstimer_list config.gz irq mtrr timer_stats consoles kallsyms net tty cpuinfokcorepagetypeinfo uptime crypto key-userspartitionsversion deviceskeys scsi vmallocinfo diskstats kmsg self vmstat dmakpagecgroup slabinfo zoneinfo driver kpagecount softirqs Container aszlig exited successfully. So the test on whether PID 1 exists in /proc is enough, because if we use PID namespaces there actually _is_ a PID 1 (as shown above) and the special file systems are already mounted. A test on the $containers variable actually mounts them twice. This unbreaks NixOS containers and I've tested this against the containers-imperative NixOS test. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @rickynils, @shlevy, @edolstra ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] d664de: nixos/tests/blivet: Fix btrfs-related tests
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: d664de018cff77df43286e1f15f7ff4aa1750451 https://github.com/NixOS/nixpkgs/commit/d664de018cff77df43286e1f15f7ff4aa1750451 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M nixos/tests/blivet.nix Log Message: --- nixos/tests/blivet: Fix btrfs-related tests The loopback-based tests use a storage size of 102400 blocks (one block is 1024 bytes), which doesn't seem to fit for btrfs volumes in recent btrfs versions. I'm setting this to 409600 (400 MB) now so that it should be enough for later versions in case they need even more space for subvolumes. Signed-off-by: aszlig <asz...@redmoonstudios.org> (cherry picked from commit 75efdc65022f71b9a61f9347d353022d46055f4d) Signed-off-by: Domen Kožar <do...@dev.si> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 75efdc: nixos/tests/blivet: Fix btrfs-related tests
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 75efdc65022f71b9a61f9347d353022d46055f4d https://github.com/NixOS/nixpkgs/commit/75efdc65022f71b9a61f9347d353022d46055f4d Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M nixos/tests/blivet.nix Log Message: --- nixos/tests/blivet: Fix btrfs-related tests The loopback-based tests use a storage size of 102400 blocks (one block is 1024 bytes), which doesn't seem to fit for btrfs volumes in recent btrfs versions. I'm setting this to 409600 (400 MB) now so that it should be enough for later versions in case they need even more space for subvolumes. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] fb46df: nixos: Fix ordering of firewall.service
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: fb46df8a9a4102e265f4b14af48a5df90d5b06c3 https://github.com/NixOS/nixpkgs/commit/fb46df8a9a4102e265f4b14af48a5df90d5b06c3 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M nixos/modules/services/networking/firewall.nix M nixos/tests/firewall.nix Log Message: --- nixos: Fix ordering of firewall.service Follow-up to the following commits: abdc5961c3cdf9f5893ea1e91ba08ff5089f53a4: Fix starting the firewall e090701e2d09aec3e8866ab9a8e53c37973ffeb4: Order before sysinit Solely use sysinit.target here instead of multi-user.target because we want to make sure that the iptables rules are applied *before* any socket units are started. The reason I've dropped the wantedBy on multi-user.target is that sysinit.target is already a part of the dependency chain of multi-user.target. To make sure that this holds true, I've added a small test case to ensure that during switch of the configuration the firewall.service is considered as well. Tested using the firewall NixOS test. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @edolstra ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 775379: qtkeychain: Fix install of translations
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: 775379188fb068d1ac1d71b4bf0b7df885bd63c2 https://github.com/NixOS/nixpkgs/commit/775379188fb068d1ac1d71b4bf0b7df885bd63c2 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M pkgs/development/libraries/qtkeychain/default.nix Log Message: --- qtkeychain: Fix install of translations The following doesn't seem to be quite right and I have missed this when I was introducing qtkeychain in the first place: -- Installing: /nix/store/...-qtkeychain-0.4.0/$out/share/qt/translations/qtkeychain_de.qm -- Installing: /nix/store/...-qtkeychain-0.4.0/$out/share/qt/translations/qtkeychain_ro.qm Signed-off-by: aszlig <asz...@redmoonstudios.org> (cherry picked from commit da24fbd0ec9380ee323bd43d1d8468e1bb229bf1) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] da24fb: qtkeychain: Fix install of translations
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: da24fbd0ec9380ee323bd43d1d8468e1bb229bf1 https://github.com/NixOS/nixpkgs/commit/da24fbd0ec9380ee323bd43d1d8468e1bb229bf1 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M pkgs/development/libraries/qtkeychain/default.nix Log Message: --- qtkeychain: Fix install of translations The following doesn't seem to be quite right and I have missed this when I was introducing qtkeychain in the first place: -- Installing: /nix/store/...-qtkeychain-0.4.0/$out/share/qt/translations/qtkeychain_de.qm -- Installing: /nix/store/...-qtkeychain-0.4.0/$out/share/qt/translations/qtkeychain_ro.qm Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: eeebc13e033800bbbe394d358550a4989a2167c6 https://github.com/NixOS/nixpkgs/commit/eeebc13e033800bbbe394d358550a4989a2167c6 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M pkgs/development/libraries/qtkeychain/default.nix Log Message: --- qtkeychain: 0.4.0 -> 0.7.0 Upstream changes since version 0.4.0: * version 0.5.0 (release 2015-05-04): - Added support for KWallet5 (KDE5/KF) * version 0.6.0 (release 2016-03-18) - Added support for the Windows Credential Store * version 0.6.1 (release 2016-03-31) - Fix KWallet not working (regressions in 0.6.0) * version 0.6.2 (release 2016-04-04) - KWallet: Fixes a crash when storing passwords, seen on Debian/KDE4 * version 0.7.0 (release 2016-05-23) - Bump SO version due to 0.6 being binary-incompatible to previous releases Tomahawk and owncloud-client depend on this library, both are still building fine after this update. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 1187b00e5872c8b65919158f2f908efb29117649 https://github.com/NixOS/nixpkgs/commit/1187b00e5872c8b65919158f2f908efb29117649 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M pkgs/development/libraries/qtkeychain/default.nix M pkgs/top-level/all-packages.nix Log Message: --- qtkeychain: Allow building with Qt 5 So far we don't yet need the Qt 5 build for qtkeychain because the two packages that depend on it are still using Qt 4. However, the next upstream version of Tomahawk for example already uses Qt 5, so let's prepare for that. Tested building against Tomahawk Git master with qt5.qtkeychain. Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/03b888e205e0...1187b00e5872___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nix] 16e88f: Don't hardcode docbook XSL namespace URL
Branch: refs/heads/1.11-maintenance Home: https://github.com/NixOS/nix Commit: 16e88f0b5ac53fc72b9180043d788077bf53ce76 https://github.com/NixOS/nix/commit/16e88f0b5ac53fc72b9180043d788077bf53ce76 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M doc/manual/local.mk Log Message: --- Don't hardcode docbook XSL namespace URL Docbook XSL got updated to version 1.79.1 in NixOS/nixpkgs@fb893a8 and we're still referring to the hardcoded previous version. So instead of just updating this to 1.79.1 we're going to use "current" in the hope that this won't happen again. I have tested this by building the manual under Nix(OS) but I haven't tested this in a non-Nix environment, so I'm not sure whether this could have implications. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @edolstra (cherry picked from commit 72fb2ccfa1f472ae2f51149cf74c3abf443b7fcf) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] f19c96: linux-testing: Fix arg list too long in modinst
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: f19c961b4e461da045f2e72e73701059e5117be0 https://github.com/NixOS/nixpkgs/commit/f19c961b4e461da045f2e72e73701059e5117be0 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-30 (Tue, 30 Aug 2016) Changed paths: A pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch M pkgs/os-specific/linux/kernel/patches.nix M pkgs/top-level/all-packages.nix Log Message: --- linux-testing: Fix arg list too long in modinst With the default kernel and thus with the build I have tested in 74ec94bfa2e57e2c0b0e469de58391d04a7b, we get an error during modules_install: make[2]: execvp: /nix/store/.../bin/bash: Argument list too long I haven't noticed this build until I actually tried booting using this kernel because make didn't fail here. The reason this happens within Nix and probably didn't yet surface in other distros is that programs only have a limited amount of memory available for storing the environment and the arguments. Environment variables however are quite common on Nix and thus we stumble on problems like this way earlier - in this case Linux 4.8 - but I have noticed this in 4.7-next as well already. The fix is far from perfect and suffers performance overhead because we now run grep for every *.mod file instead of passing all *.mod files into one single invocation of grep. But comparing the performance overhead (around 1s on my machine) with the overall build time of the kernel I think the overhead really is neglicible. Signed-off-by: aszlig <asz...@redmoonstudios.org> ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 86d195: build-rebar3: Append postPatch to original hook
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 86d1953ed4a5317e6d103aaa08bc622d7e5fb34a https://github.com/NixOS/nixpkgs/commit/86d1953ed4a5317e6d103aaa08bc622d7e5fb34a Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-29 (Mon, 29 Aug 2016) Changed paths: M pkgs/development/beam-modules/build-rebar3.nix Log Message: --- build-rebar3: Append postPatch to original hook The postPatch attribute is already in the function argument but is unused elsewhere in the code, so setting postPatch with buildRebar3 is going to end up in a no-op. This now allows to use postPatch within buildRebar3 by simply appending to the existing postPatch hook that removes the rebar and rebar3 escripts. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @ericbmerritt ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 0bce18: linux/kernel: Remove KVM_APIC_ARCHITECTURE for 4.8
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 0bce188ec184cb1b731d8adf2ee1faa777583056 https://github.com/NixOS/nixpkgs/commit/0bce188ec184cb1b731d8adf2ee1faa777583056 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-29 (Mon, 29 Aug 2016) Changed paths: M pkgs/os-specific/linux/kernel/common-config.nix Log Message: --- linux/kernel: Remove KVM_APIC_ARCHITECTURE for 4.8 The option is no longer needed and has been removed upstream in torvalds/linux@557abc40d121358883d2da8bc8bf976d6e8ec332. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 42e1ec215ea000df75db2e87273a3e8fc6167be0 https://github.com/NixOS/nixpkgs/commit/42e1ec215ea000df75db2e87273a3e8fc6167be0 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-29 (Mon, 29 Aug 2016) Changed paths: M pkgs/os-specific/linux/kernel/common-config.nix Log Message: --- linux/kernel: Remove MLX4_EN_VXLAN for 4.8 This option is no longer needed and has been removed in upstream commit torvalds/linux@a831274a1346913c145797ddee6f39e30e061318. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: 74ec94bfa2e57e2c0b0e469de58391d04a7b https://github.com/NixOS/nixpkgs/commit/74ec94bfa2e57e2c0b0e469de58391d04a7b Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-29 (Mon, 29 Aug 2016) Changed paths: M pkgs/os-specific/linux/kernel/linux-testing.nix Log Message: --- linux/kernel/testing: 4.8-rc3 -> 4.8-rc4 Tested by only building the linux_testing attribute, but haven't yet tested it in production. I've also fixed the extraMeta.branch attribute. Verified-with-PGP: ABAF 11C6 5A29 70B1 30AB E3C4 79BE 3E43 0041 1886 Signed-off-by: aszlig <asz...@redmoonstudios.org> Compare: https://github.com/NixOS/nixpkgs/compare/f85053a0216b...74ec94bfa2e5___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 55d881: Revert adding .git-revision unconditionally
Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 55d881eea334049dbb6ac10623bb895363857fca
https://github.com/NixOS/nixpkgs/commit/55d881eea334049dbb6ac10623bb895363857fca
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
R nixos/modules/installer/tools/get-git-revision
A nixos/modules/installer/tools/get-version-suffix
M nixos/modules/installer/tools/nixos-rebuild.sh
Log Message:
---
Revert adding .git-revision unconditionally
This reverts commit 1e534e234b0a92bf06361fa41b7ac8691fdbc769.
We already should have a .git directory if it is managed via Git,
otherwise there is no way to get the Git revision if neither
.git-revision or .git is present.
But having .git-revision _and_ .git present seems very much redundant to
me.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @bennofs, @Profpatsch
Issue: #17218
Commit: 0b9d9eded15e13079b1f0fef059ecb25bfb308c4
https://github.com/NixOS/nixpkgs/commit/0b9d9eded15e13079b1f0fef059ecb25bfb308c4
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M nixos/modules/misc/version.nix
Log Message:
---
nixos/version: Try to get Git revison from .git
Let's first try if we can determine the Git revision from the .git
directory and if that fails, fall back to get the info from the
".git-revision" file... and after that use something generic like
"master".
This should address #17218 in better way, because we don't need to
create another redundant file in the source checkout of nixpkgs.
I'm not going to route of falling back to using .git, because after
55d881e, we already have ".git-revision" files in people's Git
repositories, which in turn means that nixos-version will report that
old file every time even if the working tree has updated.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @bennofs, Profpatsch
Reported-by: @devhell
Fixes: #17218
Commit: f8fad62c8e8ea4ec80a5836318fc5c87f0f9fee5
https://github.com/NixOS/nixpkgs/commit/f8fad62c8e8ea4ec80a5836318fc5c87f0f9fee5
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
R nixos/modules/installer/tools/get-git-revision
A nixos/modules/installer/tools/get-version-suffix
M nixos/modules/installer/tools/nixos-rebuild.sh
M nixos/modules/misc/version.nix
Log Message:
---
Merge branch 'nixpkgs-git-revision-fix'
Addresses #17218 in a better way in that it doesn't create a
".git-revision" file on every nixos-rebuild, because we already have
".git" available. Even if we don't nixos-rebuild can't create the
"git-revision" file.
Tested via:
nix-build -E '(import ./nixos/tests/make-test.nix {
name = "foo";
machine = {};
testScript = "startAll; $machine->execute(\"nixos-version >&2\");";
})'
Closes: #17610
Acked-by: @bennofs
Compare: https://github.com/NixOS/nixpkgs/compare/19f398870a0f...f8fad62c8e8e___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 9f0acd: nixos-container: Fix missing comma in GetOptions
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 9f0acda7ebe4d8e68f44d5f207f26ef2154ba6e1 https://github.com/NixOS/nixpkgs/commit/9f0acda7ebe4d8e68f44d5f207f26ef2154ba6e1 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-07 (Sun, 07 Aug 2016) Changed paths: M pkgs/tools/virtualization/nixos-container/nixos-container.pl Log Message: --- nixos-container: Fix missing comma in GetOptions Regression introduced by fe8f0dbd53fb2497a44be21a177188d5c52e36e7. Tested using "nix-build nixos/tests/containers-imperative.nix". Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @ericbmerritt ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] bd7ce1: broadcom_sta: 6.30.223.248 -> 6.30.223.271
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: bd7ce1581daa2a43cad3a73556ed94fc2031b0eb https://github.com/NixOS/nixpkgs/commit/bd7ce1581daa2a43cad3a73556ed94fc2031b0eb Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M pkgs/os-specific/linux/broadcom-sta/default.nix A pkgs/os-specific/linux/broadcom-sta/i686-build-failure.patch R pkgs/os-specific/linux/broadcom-sta/linux-recent.patch Log Message: --- broadcom_sta: 6.30.223.248 -> 6.30.223.271 The patch for kernel version 3.18 is already applied upstream, so we don't need it any longer. Without i686-build-failure.patch, the build for i686-linux fails because it references rdtscl(), which is no longer available in Linux 4.3.0. Patch for missing rdtscl() is from Arch Linux: https://aur.archlinux.org/cgit/aur.git/tree/002-rdtscl.patch?h=broadcom-wl-ck I've tested building against 32 and 64 bit Linux versions 3.18.36, 4.4.16 and 4.7.0. The hashes were verified using the ones from the AUR (using the 16 bit hashes of course): $ nix-hash --type sha256 --to-base16 1kaqa2dw3nb8k23ffvx46g8jj3wdhz8xa6jp1v3wb35cjfr712sg 4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd $ nix-hash --type sha256 --to-base16 1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz 5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be AUR hashes can be found at: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=broadcom-wl=9d6f10b1b7745fbf5d140ac749e2253caf70daa8#n26 Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @phreedom, @vcunat Commit: 4d3545f2a579f9c68ac131794e97e22a312d9422 https://github.com/NixOS/nixpkgs/commit/4d3545f2a579f9c68ac131794e97e22a312d9422 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M pkgs/os-specific/linux/broadcom-sta/default.nix A pkgs/os-specific/linux/broadcom-sta/linux-4.7.patch Log Message: --- broadcom_sta: Add patch for supporting Linux 4.7 Patch is from Arch Linux at: https://aur.archlinux.org/cgit/aur.git/tree/?h=broadcom-wl I've tested building against 3.18.36, 4.4.16 and 4.7.0. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @phreedom, @vcunat Commit: 8f08399671911842174056b46aa1cc66c82f2a71 https://github.com/NixOS/nixpkgs/commit/8f08399671911842174056b46aa1cc66c82f2a71 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M pkgs/os-specific/linux/broadcom-sta/default.nix Log Message: --- broadcom_sta: Reindent file, no code changes Let's make sure we indent using two spaces, because the unpackPhase was indented using four spaces. Signed-off-by: aszlig <asz...@redmoonstudios.org> Commit: fef4b62657903021f9b60fc6a6cf6fe4bac167ed https://github.com/NixOS/nixpkgs/commit/fef4b62657903021f9b60fc6a6cf6fe4bac167ed Author: aszlig <asz...@redmoonstudios.org> Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M pkgs/os-specific/linux/broadcom-sta/default.nix A pkgs/os-specific/linux/broadcom-sta/null-pointer-fix.patch Log Message: --- broadcom_sta: Add patch to fix NULL pointer deref The patch is from the following Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=523326#c24 Built successfully against Linux 3.18.36, 4.4.16 and 4.7.0. Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @phreedom, @vcunat Compare: https://github.com/NixOS/nixpkgs/compare/5c7708e56806...fef4b6265790___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] ec072c: nixos/tests/installer: Fix matching LUKS prompt
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: ec072cbc4c87edd4ece210121dba83abeff0a018 https://github.com/NixOS/nixpkgs/commit/ec072cbc4c87edd4ece210121dba83abeff0a018 Author: aszlig <asz...@redmoonstudios.org> Date: 2016-07-17 (Sun, 17 Jul 2016) Changed paths: M nixos/tests/installer.nix Log Message: --- nixos/tests/installer: Fix matching LUKS prompt The LUKS passphrase prompt has changed from "Enter passphrase" to "Enter LUKS Passphrase" in c69c76ca7efecba24aba555c2a03f933997d1fd5, so the OCR detection of the test fails indefinitely. Unfortunately, this doesn't fix the test because we have a real problem here: Enter LUKS Passphrase: killall: cryptsetup: no process killed Enter LUKS Passphrase: Signed-off-by: aszlig <asz...@redmoonstudios.org> Cc: @abbradar ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 1f1f0f: chromium: Update to latest stable, beta, and dev c...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 1f1f0f049b229bfe3a8be11fe4b964d33100c7e4 https://github.com/NixOS/nixpkgs/commit/1f1f0f049b229bfe3a8be11fe4b964d33100c7e4 Author: Scott R. Parish <srpar...@gmail.com> Date: 2016-06-19 (Sun, 19 Jun 2016) Changed paths: M pkgs/applications/networking/browsers/chromium/common.nix M pkgs/applications/networking/browsers/chromium/upstream-info.nix Log Message: --- chromium: Update to latest stable, beta, and dev channels stable 51.0.2704.63 => 51.0.2704.103 beta 51.0.2704.63 => 52.0.2743.41 dev52.0.2743.10 => 53.0.2767.4 This addresses 15 security fixes, including: * High CVE-2015-1696: Cross-origin bypass in Extension bindings. Credit to anonymous. * High CVE-2015-1697: Cross-origin bypass in Blink. Credit to Mariusz Mlynski. * Medium CVE-2016-1698: Information leak in Extension bindings. Credit to Rob Wu. * Medium CVE-2016-1699: Parameter sanitization failure in DevTools. Credit to Gregory Panakkal. * Medium CVE-2016-1700: Use-after-free in Extensions. Credit to Rob Wu. * Medium CVE-2016-1701: Use-after-free in Autofill. Credit to Rob Wu. * Medium CVE-2016-1702: Out-of-bounds read in Skia. Credit to cloudfuzzer. See: http://googlechromereleases.blogspot.com/2016/06/stable-channel-update.html Commit: 9728554c4fd8cec0c1e24ab788f12e14471c4a7f https://github.com/NixOS/nixpkgs/commit/9728554c4fd8cec0c1e24ab788f12e14471c4a7f Author: aszlig <asz...@redmoonstudios.org> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M pkgs/applications/networking/browsers/chromium/common.nix M pkgs/applications/networking/browsers/chromium/upstream-info.nix Log Message: --- Merge pull request #16099 (Chromium update) The changes contain an update of the stable channel (along with beta and dev as well) fixing 18 security vulnerabilities: http://googlechromereleases.blogspot.de/2016/06/stable-channel-update.html http://googlechromereleases.blogspot.de/2016/06/stable-channel-update_6.html http://googlechromereleases.blogspot.de/2016/06/stable-channel-update_16.html I've built and tested this at the following evaluation on my Hydra: https://headcounter.org/hydra/eval/324449 Compare: https://github.com/NixOS/nixpkgs/compare/ca495a53a55d...9728554c4fd8___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
