[Nix-commits] [NixOS/nixpkgs] 83a2d7: redis: 3.0.7 -> 3.2.2
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 83a2d74a7ce8011e76f0dc5f0332b2a005249763 https://github.com/NixOS/nixpkgs/commit/83a2d74a7ce8011e76f0dc5f0332b2a005249763 Author: Christine Koppelt Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/servers/nosql/redis/default.nix Log Message: --- redis: 3.0.7 -> 3.2.2 Commit: 07ca9bd4bc7b7c57fbf628e60197cc8b7821404b https://github.com/NixOS/nixpkgs/commit/07ca9bd4bc7b7c57fbf628e60197cc8b7821404b Author: Christine Koppelt Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M nixos/doc/manual/release-notes/rl-1609.xml Log Message: --- Redis: add entry to release notes Commit: dbd856d7240b992fc45aedf6e2227f4028b72a5b https://github.com/NixOS/nixpkgs/commit/dbd856d7240b992fc45aedf6e2227f4028b72a5b Author: Gabriel Ebner Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M nixos/doc/manual/release-notes/rl-1609.xml M pkgs/servers/nosql/redis/default.nix Log Message: --- Merge pull request #17387 from cko/redis redis: 3.0.7 -> 3.2.2 Compare: https://github.com/NixOS/nixpkgs/compare/bafc296e531a...dbd856d7240b___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] bafc29: holdingnuts: init at 0.0.5
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: bafc296e531aab26d2aa351f1dacf0ba632f4512 https://github.com/NixOS/nixpkgs/commit/bafc296e531aab26d2aa351f1dacf0ba632f4512 Author: obadz Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: A pkgs/games/holdingnuts/default.nix M pkgs/top-level/all-packages.nix Log Message: --- holdingnuts: init at 0.0.5 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 86cf45: zam-plugins: 3.6 -> 3.7
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 86cf45338a7c43d9e2b2b2fb4cc41f14aca85398 https://github.com/NixOS/nixpkgs/commit/86cf45338a7c43d9e2b2b2fb4cc41f14aca85398 Author: Bart Brouns Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/applications/audio/zam-plugins/default.nix Log Message: --- zam-plugins: 3.6 -> 3.7 Commit: 8c735c3aee87ec6908e91f651bfad2b7fa067146 https://github.com/NixOS/nixpkgs/commit/8c735c3aee87ec6908e91f651bfad2b7fa067146 Author: Robin Gloster Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/applications/audio/zam-plugins/default.nix Log Message: --- Merge pull request #17388 from magnetophon/zam-plugins zam-plugins: 3.6 -> 3.7 Compare: https://github.com/NixOS/nixpkgs/compare/022c888a5f07...8c735c3aee87___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 8db2b2: cpuminer-multi: 20140723 -> 20160316
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 8db2b2e2cd647a245c007226473ca7092f82fa9b https://github.com/NixOS/nixpkgs/commit/8db2b2e2cd647a245c007226473ca7092f82fa9b Author: Kranium Gikos Mendoza Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/tools/misc/cpuminer-multi/default.nix Log Message: --- cpuminer-multi: 20140723 -> 20160316 Commit: 022c888a5f07a91924f14d996832738a7fe740e2 https://github.com/NixOS/nixpkgs/commit/022c888a5f07a91924f14d996832738a7fe740e2 Author: Robin Gloster Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/tools/misc/cpuminer-multi/default.nix Log Message: --- Merge pull request #17403 from womfoo/bump/cpuminer-multi-20160316 cpuminer-multi: 20140723 -> 20160316, limit builds to linux Compare: https://github.com/NixOS/nixpkgs/compare/fa831496ef99...022c888a5f07___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 845317: construo: remove use of `builderDefsPackage`
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 845317e5d62f8e42155933a7c4c74eaca85eb94f https://github.com/NixOS/nixpkgs/commit/845317e5d62f8e42155933a7c4c74eaca85eb94f Author: Robert Helgesson Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/games/construo/default.nix Log Message: --- construo: remove use of `builderDefsPackage` Commit: 677add282239748a97f7674d56b59a26856650a7 https://github.com/NixOS/nixpkgs/commit/677add282239748a97f7674d56b59a26856650a7 Author: Robert Helgesson Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/games/construo/default.nix Log Message: --- construo: 0.2.2 -> 0.2.3 Commit: fa831496ef9963eaba6064c6c8fa8d1df8b59dbd https://github.com/NixOS/nixpkgs/commit/fa831496ef9963eaba6064c6c8fa8d1df8b59dbd Author: Robin Gloster Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/games/construo/default.nix Log Message: --- Merge pull request #17415 from rycee/build-defs/construo Build defs/construo Compare: https://github.com/NixOS/nixpkgs/compare/7a799b94a359...fa831496ef99___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 7a799b: awscli: 1.10.46 -> 1.10.51
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 7a799b94a3596b6631d6601c12c90e57008b9fc7 https://github.com/NixOS/nixpkgs/commit/7a799b94a3596b6631d6601c12c90e57008b9fc7 Author: Dan Peebles Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- awscli: 1.10.46 -> 1.10.51 This also required a bump of botocore from 1.4.36 to 1.4.41. I tested boto3 with the new version and it seemed to work fine. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 96e553: matrix-synapse: fix missing curses dependency
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 96e5533cfac0eebb44e072cc494b3b65ee2982f7 https://github.com/NixOS/nixpkgs/commit/96e5533cfac0eebb44e072cc494b3b65ee2982f7 Author: Benjamin Saunders Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/servers/matrix-synapse/default.nix Log Message: --- matrix-synapse: fix missing curses dependency Commit: a629cd3f02c2ad071e58d5898c5f48fb0336a705 https://github.com/NixOS/nixpkgs/commit/a629cd3f02c2ad071e58d5898c5f48fb0336a705 Author: Frederik Rietdijk Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/servers/matrix-synapse/default.nix Log Message: --- Merge pull request #17412 from Ralith/matrix-synapse-curses matrix-synapse: fix missing curses dependency Compare: https://github.com/NixOS/nixpkgs/compare/4fa4f23805c5...a629cd3f02c2___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 33b993: Add geant4 license
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 33b9935878e6226d93c55fb8370d0c10e685bc42 https://github.com/NixOS/nixpkgs/commit/33b9935878e6226d93c55fb8370d0c10e685bc42 Author: Josef Kemetmueller Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M lib/licenses.nix Log Message: --- Add geant4 license This license was left out during the geant4 pull request: https://github.com/NixOS/nixpkgs/pull/3963 Commit: 4fa4f23805c5d75a5472df017b5e98fa47a0cf0a https://github.com/NixOS/nixpkgs/commit/4fa4f23805c5d75a5472df017b5e98fa47a0cf0a Author: Vladimír Čunát Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M lib/licenses.nix Log Message: --- Merge #17409: licenses: add geant4 license Compare: https://github.com/NixOS/nixpkgs/compare/d7f7ef4c2164...4fa4f23805c5___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 9045a8: declarative containers: additional veths
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 9045a8e24c4c4a981b76df7d6ddcde99a7606831 https://github.com/NixOS/nixpkgs/commit/9045a8e24c4c4a981b76df7d6ddcde99a7606831 Author: Arnold Krille Date: 2016-07-28 (Thu, 28 Jul 2016) Changed paths: M nixos/modules/virtualisation/containers.nix M nixos/release.nix A nixos/tests/containers-extra_veth.nix Log Message: --- declarative containers: additional veths With these changes, a container can have more then one veth-pair. This allows for example to have LAN and DMZ as bridges on the host and add dedicated containers for proxies, ipv4-firewall and ipv6-firewall. Or to have a bridge for normal WAN, one bridge for administration and one bridge for customer-internal communication. So that web-server containers can be reached from outside per http, from the management via ssh and can talk to their database via the customer network. The scripts to set up the containers are now rendered several times instead of just one template. The scripts now contain per-container code to configure the extra veth interfaces. The default template without support for extra-veths is still rendered for the imperative containers. Also a test is there to see if extra veths can be placed into host-bridges or can be reached via routing. Commit: 07de11f165cfb6e6357938a434e29b2fa8911cbd https://github.com/NixOS/nixpkgs/commit/07de11f165cfb6e6357938a434e29b2fa8911cbd Author: Arnold Krille Date: 2016-07-28 (Thu, 28 Jul 2016) Changed paths: M nixos/tests/containers-bridge.nix M nixos/tests/containers-extra_veth.nix M nixos/tests/containers-imperative.nix M nixos/tests/containers-ipv4.nix M nixos/tests/containers-ipv6.nix Log Message: --- containers: add myself to the maintainers of the tests Seems like the right thing to do. Commit: d7f7ef4c2164897f2232c649f48f1a97305b7ecb https://github.com/NixOS/nixpkgs/commit/d7f7ef4c2164897f2232c649f48f1a97305b7ecb Author: Franz Pletz Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M nixos/modules/virtualisation/containers.nix M nixos/release.nix M nixos/tests/containers-bridge.nix A nixos/tests/containers-extra_veth.nix M nixos/tests/containers-imperative.nix M nixos/tests/containers-ipv4.nix M nixos/tests/containers-ipv6.nix Log Message: --- Merge pull request #15496 from kampfschlaefer/containers_more_veth_interfaces Declarative containers: more veth interfaces Compare: https://github.com/NixOS/nixpkgs/compare/03a8f723bdce...d7f7ef4c2164___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 36bc52: Add long-shebang tool
Branch: refs/heads/release-16.03 Home: https://github.com/NixOS/nixpkgs Commit: 36bc5257e395b627f7f99851f72545544f3943a9 https://github.com/NixOS/nixpkgs/commit/36bc5257e395b627f7f99851f72545544f3943a9 Author: Shea Levy Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: A pkgs/misc/long-shebang/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Add long-shebang tool (cherry picked from commit 03a8f723bdce313fed87e2ef5c8931f9d6715ae3) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 03a8f7: Add long-shebang tool
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 03a8f723bdce313fed87e2ef5c8931f9d6715ae3 https://github.com/NixOS/nixpkgs/commit/03a8f723bdce313fed87e2ef5c8931f9d6715ae3 Author: Shea Levy Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: A pkgs/misc/long-shebang/default.nix M pkgs/top-level/all-packages.nix Log Message: --- Add long-shebang tool ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] a28273: mopidy service: add default value for configuratio...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: a28273df32b970e29872b29ad87b4131c68f9a06 https://github.com/NixOS/nixpkgs/commit/a28273df32b970e29872b29ad87b4131c68f9a06 Author: Langston Barrett Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M nixos/modules/services/audio/mopidy.nix Log Message: --- mopidy service: add default value for configuration (#17385) Mopidy will start if the configuration is empty. Fixes #17381. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] e36244: kde5: avoid propagating dev outputs to reduce clos...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: e362442562576dcf76e914a69e0cc8557311635b https://github.com/NixOS/nixpkgs/commit/e362442562576dcf76e914a69e0cc8557311635b Author: Thomas Tuegel Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/development/libraries/kde-frameworks/setup-hook.sh Log Message: --- kde5: avoid propagating dev outputs to reduce closure size Commit: 795cfd578a4ec8c9b78b39cf60102904a23af993 https://github.com/NixOS/nixpkgs/commit/795cfd578a4ec8c9b78b39cf60102904a23af993 Author: Thomas Tuegel Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/desktops/kde-5/plasma/bluedevil.nix M pkgs/desktops/kde-5/plasma/kde-cli-tools.nix M pkgs/desktops/kde-5/plasma/kinfocenter.nix M pkgs/desktops/kde-5/plasma/kmenuedit.nix M pkgs/desktops/kde-5/plasma/kscreen.nix M pkgs/desktops/kde-5/plasma/kscreenlocker.nix M pkgs/desktops/kde-5/plasma/ksshaskpass.nix M pkgs/desktops/kde-5/plasma/ksysguard.nix M pkgs/desktops/kde-5/plasma/kwin/default.nix M pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix M pkgs/desktops/kde-5/plasma/plasma-nm/default.nix M pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix M pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix M pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix M pkgs/desktops/kde-5/plasma/powerdevil.nix M pkgs/desktops/kde-5/plasma/systemsettings.nix Log Message: --- kde5.plasma: unwrap everything Commit: c122f791c95db53a0d86d0dffc9e4a7b2fda12bd https://github.com/NixOS/nixpkgs/commit/c122f791c95db53a0d86d0dffc9e4a7b2fda12bd Author: Thomas Tuegel Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/desktops/kde-5/applications/dolphin-plugins.nix M pkgs/desktops/kde-5/applications/dolphin.nix M pkgs/development/libraries/kde-frameworks/default.nix A pkgs/development/libraries/kde-frameworks/kde-env.nix A pkgs/development/libraries/kde-frameworks/kde-wrapper.nix M pkgs/development/libraries/kde-frameworks/setup-hook.sh Log Message: --- Add kdeEnv and kdeWrapper Commit: aaf612e833e6813245dd1c913b2a121fcfca3e06 https://github.com/NixOS/nixpkgs/commit/aaf612e833e6813245dd1c913b2a121fcfca3e06 Author: Thomas Tuegel Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/development/libraries/kde-frameworks/default.nix Log Message: --- kdeDerivation: don't fail by default on library-only packages Commit: 22bc6f01cfaa86953802060138128a2783781b4d https://github.com/NixOS/nixpkgs/commit/22bc6f01cfaa86953802060138128a2783781b4d Author: Thomas Tuegel Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/development/libraries/kde-frameworks/default.nix M pkgs/development/libraries/kde-frameworks/kde-env.nix Log Message: --- kdeEnv: use package version, not ecm version Commit: d1d38f2888ab63e83ee412a526e017a91a1b57ba https://github.com/NixOS/nixpkgs/commit/d1d38f2888ab63e83ee412a526e017a91a1b57ba Author: Thomas Tuegel Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/development/libraries/kde-frameworks/kde-wrapper.nix Log Message: --- kdeWrapper: include wrappers in path Commit: f7d98785d5be667fb535f7f3325b85b53ec43270 https://github.com/NixOS/nixpkgs/commit/f7d98785d5be667fb535f7f3325b85b53ec43270 Author: Thomas Tuegel Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/development/libraries/kde-frameworks/breeze-icons.nix Log Message: --- breeze-icons: don't propagate qtsvg build input breeze-icons does not have a separate dev output, so this pulls qtsvg.dev into the closure. Commit: ab58794838d33b4426b81f2887d64f40e31fdf49 https://github.com/NixOS/nixpkgs/commit/ab58794838d33b4426b81f2887d64f40e31fdf49 Author: Thomas Tuegel Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/development/libraries/kde-frameworks/kde-wrapper.nix Log Message: --- kdeWrapper: assume empty path list by default Commit: 425f9be1c8c56f7f9bc4beff067f492940eafa4e https://github.com/NixOS/nixpkgs/commit/425f9be1c8c56f7f9bc4beff067f492940eafa4e Author: Thomas Tuegel Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/desktops/kde-5/applications/ark/default.nix Log Message: --- ark: use kdeWrapper Commit: 0206373fb2cee04794566c27ccc919cf5ee1b0ac https://github.com/NixOS/nixpkgs/commit/0206373fb2cee04794566c27ccc919cf5ee1b0ac Author: Thomas Tuegel Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/desktops/kde-5/applications/filelight.nix Log Message: --- filelight: use kdeWrapper Commit: e824741a2dbf9aec434e66aa5795fd7bdf37ac30 https://github.com/NixOS/nixpkgs/commit/e824741a2dbf9aec434e66aa5795fd7bdf37ac30 Aut
Re: [Nix-dev] Hydra is down
On 07/31/2016 07:27 AM, Daniel Hlynskyi wrote: > https://hydra.nixos.org/ returns 500 Internal Server Error Now it's up again, after more than a day, I think. smime.p7s Description: S/MIME Cryptographic Signature ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] [NixOS/nixpkgs] 0d259f: aws-sdk-cpp: add compile flag -fpermissive due to ...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 0d259f841b560acc1c5a2c9cbbd38614019bdba8 https://github.com/NixOS/nixpkgs/commit/0d259f841b560acc1c5a2c9cbbd38614019bdba8 Author: obadz Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/development/libraries/aws-sdk-cpp/default.nix Log Message: --- aws-sdk-cpp: add compile flag -fpermissive due to libcurl upgrade curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and therefore requires the followin flag until this package gets updated ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Handling nix-shell shebangs with the new nix command
I've made several PRs and issues, see https://github.com/NixOS/nix/milestone/6 Profpatsch writes: > On 16-07-29 04:48pm, Shea Levy wrote: >> Hi Eelco, >> >> For the perl->c++ work, how should we handle nix-shell shebangs given >> that the command is now "nix shell"? Should the nix command itself >> contain shebang-checking logic, or should we have a separate nix-shell >> C++ program just for shebangs, or something else? > > I wonder what the progress of the „getting rid of perl“ thingy is? > This is the first time it has come up in months, how far along is it? > > -- > Proudly written in Mutt with Vim on NixOS. > Q: Why is this email five sentences or less? > A: http://five.sentenc.es > May take up to five days to read your message. If it’s urgent, call me. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Handling nix-shell shebangs with the new nix command
On 16-07-29 04:48pm, Shea Levy wrote: > Hi Eelco, > > For the perl->c++ work, how should we handle nix-shell shebangs given > that the command is now "nix shell"? Should the nix command itself > contain shebang-checking logic, or should we have a separate nix-shell > C++ program just for shebangs, or something else? I wonder what the progress of the „getting rid of perl“ thingy is? This is the first time it has come up in months, how far along is it? -- Proudly written in Mutt with Vim on NixOS. Q: Why is this email five sentences or less? A: http://five.sentenc.es May take up to five days to read your message. If it’s urgent, call me. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] evalModules: how to use it?
The advice from Bjorn was correct, but there is a bug in containers code. Many thanks to @layus for investigating into this problem! PR with fix https://github.com/NixOS/nixpkgs/pull/17365 2016-07-07 7:47 GMT+00:00 Daniel Hlynskyi : > Unfortunately, I don't understand how can apply mkMerge here. Is the > following example correct? > > containers.test-1.config = > > let cfg1 = { > > networking.extraHosts = '' > > 10.10.10.10 bla1 > > ''; > > }; > > cfg2 = { > > networking.extraHosts = '' > > 11.11.11.11 bla2 > > ''; > > }; > > in lib.mkMerge [ > > cfg1 > > cfg2 > > ]; > > It doesn't do what I want: > > $ sudo nixos-container run test-1 -- cat /etc/hosts > 127.0.0.1 localhost > ::1 localhost > > 11.11.11.11 bla2 > > Maybe I should reference somehow to base modules? > > 6 лип. 2016 7:13 пп "Bjørn Forsman" пише: > >> >> Maybe what you want is lib.mkMerge? >> >> - Bjørn >> > ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] [NixOS/nixpkgs] d64529: wireguard: 20160708 -> 2016-07-22 (#17362)
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: d6452987fb1af2aece6367c9d8d98ce1993ecc79 https://github.com/NixOS/nixpkgs/commit/d6452987fb1af2aece6367c9d8d98ce1993ecc79 Author: Eric Sagnes Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/os-specific/linux/wireguard/default.nix Log Message: --- wireguard: 20160708 -> 2016-07-22 (#17362) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 8878e8: leo2: remove use of `builderDefsPackage` (#17398)
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 8878e8ec05845b92fc5bca7f22c5bb0a0f19dad4 https://github.com/NixOS/nixpkgs/commit/8878e8ec05845b92fc5bca7f22c5bb0a0f19dad4 Author: Robert Helgesson Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/applications/science/logic/leo2/default.nix Log Message: --- leo2: remove use of `builderDefsPackage` (#17398) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] d3d0ba: mopidy-musicbox-webclient: 2.2.0 -> 2.3.0 (#17391)
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: d3d0bab56e6bf835ed3db57aa6ecacc0eb2c5967 https://github.com/NixOS/nixpkgs/commit/d3d0bab56e6bf835ed3db57aa6ecacc0eb2c5967 Author: Langston Barrett Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/applications/audio/mopidy-musicbox-webclient/default.nix Log Message: --- mopidy-musicbox-webclient: 2.2.0 -> 2.3.0 (#17391) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 76b21b: nixos/firewall: Refactor rpfilter, allow DHCPv4 (#...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 76b21b7adb9542747b65c2c95008e55bb9df8ecd https://github.com/NixOS/nixpkgs/commit/76b21b7adb9542747b65c2c95008e55bb9df8ecd Author: Franz Pletz Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M nixos/modules/services/networking/firewall.nix Log Message: --- nixos/firewall: Refactor rpfilter, allow DHCPv4 (#17325) Adds a new chain in the raw table for reverse path filtering and optional logging. A rule to allow serving DHCPv4 was also added as it is commonly needed and poses no security risk even when no DHCPv4 server is running. Fixes #10101. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] a6984a: git-up: init at 1.4.0
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: a6984a39655341c1aff18dad0254d59189b02ef0 https://github.com/NixOS/nixpkgs/commit/a6984a39655341c1aff18dad0254d59189b02ef0 Author: Peter Hoeg Date: 2016-07-30 (Sat, 30 Jul 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- git-up: init at 1.4.0 Thanks again to @fridh for feedback! Commit: 5088f24dedd7a8905807ff7f5462020f2e5d8d78 https://github.com/NixOS/nixpkgs/commit/5088f24dedd7a8905807ff7f5462020f2e5d8d78 Author: Frederik Rietdijk Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- Merge pull request #15751 from peterhoeg/git-up git-up: init at 1.4.0 Compare: https://github.com/NixOS/nixpkgs/compare/b714fdb5746f...5088f24dedd7___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 4db39e: pythonPackages.vobject: 0.8.1d -> 0.9.2
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 4db39e8d0f397237f32fbf51af9156ae9e482c71 https://github.com/NixOS/nixpkgs/commit/4db39e8d0f397237f32fbf51af9156ae9e482c71 Author: Gabriel Ebner Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/top-level/python-packages.nix Log Message: --- pythonPackages.vobject: 0.8.1d -> 0.9.2 Commit: b714fdb5746f57c26a41ced7b8641ac298456fa0 https://github.com/NixOS/nixpkgs/commit/b714fdb5746f57c26a41ced7b8641ac298456fa0 Author: Gabriel Ebner Date: 2016-07-31 (Sun, 31 Jul 2016) Changed paths: M pkgs/applications/misc/khard/default.nix Log Message: --- khard: 0.9.0 -> 0.11.1 Compare: https://github.com/NixOS/nixpkgs/compare/b68b518c1a0b...b714fdb5746f___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits