[Nix-commits] [NixOS/nixpkgs] 954e14: emscripten 1.37.1 -> 1.37.3
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 954e145101494c3114fffeded5e439ad0a4b8493 https://github.com/NixOS/nixpkgs/commit/954e145101494c3114fffeded5e439ad0a4b8493 Author: Ben ZhangDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/compilers/emscripten/default.nix Log Message: --- emscripten 1.37.1 -> 1.37.3 Commit: 49a14162b972ddef04adc3258596d2d1e5ba8a6b https://github.com/NixOS/nixpkgs/commit/49a14162b972ddef04adc3258596d2d1e5ba8a6b Author: Ben Zhang Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/compilers/emscripten-fastcomp/default.nix Log Message: --- Update emscripten-fastcomp version to 1.37.3 Commit: a7e89c6401fb8272cc3ed36d3b380c40d7e3d0f5 https://github.com/NixOS/nixpkgs/commit/a7e89c6401fb8272cc3ed36d3b380c40d7e3d0f5 Author: Gabriel Ebner Date: 2017-03-11 (Sat, 11 Mar 2017) Changed paths: M pkgs/development/compilers/emscripten-fastcomp/default.nix M pkgs/development/compilers/emscripten/default.nix Log Message: --- Merge pull request #23743 from ben-z/emscripten-1.37.3 emscripten 1.37.1 -> 1.37.3 Compare: https://github.com/NixOS/nixpkgs/compare/8d3c35ad024a...a7e89c6401fb___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] fb4c43: curl: Use CA bundle in nix default profile by defa...
Branch: refs/heads/staging Home: https://github.com/NixOS/nixpkgs Commit: fb4c43dd8adbd7a10d1c52539b36e2da269f3f7f https://github.com/NixOS/nixpkgs/commit/fb4c43dd8adbd7a10d1c52539b36e2da269f3f7f Author: Shea LevyDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/networking/curl/default.nix Log Message: --- curl: Use CA bundle in nix default profile by default ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] LXC containers on NixOS
hey, we have LXC (not libvirt) with unprivileged NixOS running at nixcloud.io and we could give you some help. what do you want to know? On 07.03.2017 17:44, Volth wrote: > Hello > > I saw (in blogs, issue comments, ...) then some of you are using LXC > containers with NixOS as host, even in production. > > Could you please share your setup? > > My attempts to use them encounter the showstopper bugs: raw LXC > containers do not start > (https://github.com/NixOS/nixpkgs/issues/23604). > libvirt-lxc works, but "virsh -c lxc:/// destroy my-container" does > not kill the container processes. > ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] [NixOS/nixpkgs] a2eae3: Revert "Merge pull request #23602 from periklis/to...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: a2eae3bc4433e8d3f3c3690532bf99fdfbd8b3a1 https://github.com/NixOS/nixpkgs/commit/a2eae3bc4433e8d3f3c3690532bf99fdfbd8b3a1 Author: Daiderd JordanDate: 2017-03-11 (Sat, 11 Mar 2017) Changed paths: M pkgs/development/libraries/qt-5/5.7/default.nix R pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch M pkgs/development/libraries/qt-5/5.7/qtbase/default.nix M pkgs/development/libraries/qt-5/5.7/qtbase/series Log Message: --- Revert "Merge pull request #23602 from periklis/topic_qt57_darwin" This reverts commit 4c0737eb80af8a1e0c0bab4c51454807837dfdde, reversing changes made to 943c4ed72ff85bb9a2610d8909ee68bb0f0d0744. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 77c497: linux_testing: 4.10-rc7 -> 4.11-rc1
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 77c49794cd773d8a20f61b28d430c9673d5452fe https://github.com/NixOS/nixpkgs/commit/77c49794cd773d8a20f61b28d430c9673d5452fe Author: Tuomas TynkkynenDate: 2017-03-11 (Sat, 11 Mar 2017) Changed paths: M pkgs/os-specific/linux/kernel/common-config.nix M pkgs/os-specific/linux/kernel/linux-testing.nix M pkgs/top-level/all-packages.nix Log Message: --- linux_testing: 4.10-rc7 -> 4.11-rc1 Some config options got removed, so conditionalize them. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] b52af4: virtualisation-xen: fix defaultText interpolation
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: b52af49d36867fa4e51f2a35a745e0b47a0f21a6 https://github.com/NixOS/nixpkgs/commit/b52af49d36867fa4e51f2a35a745e0b47a0f21a6 Author: Daiderd JordanDate: 2017-03-11 (Sat, 11 Mar 2017) Changed paths: M nixos/modules/virtualisation/xen-dom0.nix Log Message: --- virtualisation-xen: fix defaultText interpolation ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 2151e3: packetdrill: init at 1.0
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 2151e3b8ebfeee97655704e140ecb7a5dee8ec9c https://github.com/NixOS/nixpkgs/commit/2151e3b8ebfeee97655704e140ecb7a5dee8ec9c Author: David JohnsonDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M lib/maintainers.nix A pkgs/tools/networking/packetdrill/default.nix A pkgs/tools/networking/packetdrill/nix.patch M pkgs/top-level/all-packages.nix Log Message: --- packetdrill: init at 1.0 Closes https://github.com/NixOS/nixpkgs/pull/23679 Commit: 8db26dbee4f5cc6bf8f91e8a2897df1c22679125 https://github.com/NixOS/nixpkgs/commit/8db26dbee4f5cc6bf8f91e8a2897df1c22679125 Author: Joachim Fasting Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/networking/packetdrill/default.nix Log Message: --- packetdrill: minor packaging tweaks - native build inputs - allow building with hardening Compare: https://github.com/NixOS/nixpkgs/compare/798623fd2b0b...8db26dbee4f5___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 328eb9: libreoffice-still: apply the patch for ICU 58
Branch: refs/heads/staging-17.03 Home: https://github.com/NixOS/nixpkgs Commit: 328eb9da7caf8ea4a16ea1224b39dc40b3f222ec https://github.com/NixOS/nixpkgs/commit/328eb9da7caf8ea4a16ea1224b39dc40b3f222ec Author: Michael Raskin <7c6f4...@mail.ru> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/office/libreoffice/still.nix Log Message: --- libreoffice-still: apply the patch for ICU 58 see #17126 (cherry picked from commit f3a4f31554f655440181aa6085ed7fea5b4c24e4) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] d5ef0d: crunch: enable darwin build
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: d5ef0daf7c7a363aff0e7afa81629bb04a18401d https://github.com/NixOS/nixpkgs/commit/d5ef0daf7c7a363aff0e7afa81629bb04a18401d Author: Daiderd JordanDate: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M pkgs/tools/security/crunch/default.nix Log Message: --- crunch: enable darwin build Commit: 798623fd2b0bb85c355f7d40c57a4fc10b2c36a0 https://github.com/NixOS/nixpkgs/commit/798623fd2b0bb85c355f7d40c57a4fc10b2c36a0 Author: Daiderd Jordan Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/security/crunch/default.nix Log Message: --- Merge pull request #23653 from LnL7/darwin-crunch crunch: enable darwin build Compare: https://github.com/NixOS/nixpkgs/compare/8b7f5e8db266...798623fd2b0b___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 44cf3c: dnsmasq: install launchd plist on darwin
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 44cf3c44b0b1d4f278e1be379ab24d6abbf4f71b https://github.com/NixOS/nixpkgs/commit/44cf3c44b0b1d4f278e1be379ab24d6abbf4f71b Author: Nick NovitskiDate: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M pkgs/tools/networking/dnsmasq/default.nix Log Message: --- dnsmasq: install launchd plist on darwin Commit: 8b7f5e8db266644f864f84a4dea7152cb1c6cb3e https://github.com/NixOS/nixpkgs/commit/8b7f5e8db266644f864f84a4dea7152cb1c6cb3e Author: Daiderd Jordan Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/networking/dnsmasq/default.nix Log Message: --- Merge pull request #23578 from nicknovitski/dnsmasq-plist dnsmasq: install launchd plist on darwin Compare: https://github.com/NixOS/nixpkgs/compare/f0f77af897f1...8b7f5e8db266___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] f9f31f: pdnsd: fix darwin build
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: f9f31ff83e4af66716ce0bbd23d28be10838b107 https://github.com/NixOS/nixpkgs/commit/f9f31ff83e4af66716ce0bbd23d28be10838b107 Author: Daiderd JordanDate: 2017-03-08 (Wed, 08 Mar 2017) Changed paths: M pkgs/tools/networking/pdnsd/default.nix Log Message: --- pdnsd: fix darwin build Commit: f0f77af897f1730684c6f03ecdff03b76444c52f https://github.com/NixOS/nixpkgs/commit/f0f77af897f1730684c6f03ecdff03b76444c52f Author: Daiderd Jordan Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/networking/pdnsd/default.nix Log Message: --- Merge pull request #23567 from LnL7/darwin-pdnsd pdnsd: fix darwin build Compare: https://github.com/NixOS/nixpkgs/compare/65b8a97ab341...f0f77af897f1___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 65b8a9: litecoin: 0.10.2.2 -> 0.13.2.1
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 65b8a97ab341d18bfeb1026c3e19cf69ca20a140 https://github.com/NixOS/nixpkgs/commit/65b8a97ab341d18bfeb1026c3e19cf69ca20a140 Author: ndowensDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/altcoins/litecoin.nix Log Message: --- litecoin: 0.10.2.2 -> 0.13.2.1 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] b34b46: jbuilder: init at 1.0+beta2
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: b34b4674d2c810ebc339cdd299544685692ebedb https://github.com/NixOS/nixpkgs/commit/b34b4674d2c810ebc339cdd299544685692ebedb Author: Vincent LaporteDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: A pkgs/development/tools/ocaml/jbuilder/default.nix M pkgs/top-level/all-packages.nix Log Message: --- jbuilder: init at 1.0+beta2 jbuilder is a fast, portable and opinionated build system Homepage: https://github.com/janestreet/jbuilder ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 1b1d85: scalafmt: 0.5.8 -> 0.6.2
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 1b1d85bf752d90ec8116c1125262e5f788c77704 https://github.com/NixOS/nixpkgs/commit/1b1d85bf752d90ec8116c1125262e5f788c77704 Author: Markus HauckDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/tools/scalafmt/default.nix Log Message: --- scalafmt: 0.5.8 -> 0.6.2 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] ba499a: pythonPackages.pep257: meta.lecense -> license
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: ba499aa845fc907844b84e90a630aaaf5149cead https://github.com/NixOS/nixpkgs/commit/ba499aa845fc907844b84e90a630aaaf5149cead Author: Joachim FastingDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/python-modules/pep257.nix Log Message: --- pythonPackages.pep257: meta.lecense -> license Commit: 5bf3b4c7ff2531f2cf6c2a53d9caa0d6746e1c48 https://github.com/NixOS/nixpkgs/commit/5bf3b4c7ff2531f2cf6c2a53d9caa0d6746e1c48 Author: Joachim Fasting Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/tools/vndr/default.nix Log Message: --- vndr: meta.licence -> license Compare: https://github.com/NixOS/nixpkgs/compare/7dff6a868935...5bf3b4c7ff25___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 7dff6a: kubernetes: fix on Darwin
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 7dff6a8689351069ba3734aad2c90e19b3b835b0 https://github.com/NixOS/nixpkgs/commit/7dff6a8689351069ba3734aad2c90e19b3b835b0 Author: Dan PeeblesDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/networking/cluster/kubernetes/default.nix M pkgs/top-level/all-packages.nix Log Message: --- kubernetes: fix on Darwin Also bump its Go version to 1.7, since 1.6 is fatally flawed on macOS 10.12 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 2b4503: boost155: Not supported on aarch64
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 2b450377bf6e51cce0d831a88e74d5f61811b74d https://github.com/NixOS/nixpkgs/commit/2b450377bf6e51cce0d831a88e74d5f61811b74d Author: Tuomas TynkkynenDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/libraries/boost/generic.nix Log Message: --- boost155: Not supported on aarch64 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] c6da2c: nixos/dnscrypt-proxy: use example.com in example v...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: c6da2c7c2bec396fe5557d08d595a2f75fea98fc https://github.com/NixOS/nixpkgs/commit/c6da2c7c2bec396fe5557d08d595a2f75fea98fc Author: Joachim FastingDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M nixos/modules/services/networking/dnscrypt-proxy.nix Log Message: --- nixos/dnscrypt-proxy: use example.com in example values It is the canonical example domain after all. Commit: 563c8e14965e15833c465330dfba1d94854285cf https://github.com/NixOS/nixpkgs/commit/563c8e14965e15833c465330dfba1d94854285cf Author: Joachim Fasting Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M nixos/modules/services/networking/dnscrypt-proxy.nix Log Message: --- nixos/dnscrypt-proxy: inline top-level binding (cleanup) Commit: c0a8a9205b590828c2a174f751c80908e632f734 https://github.com/NixOS/nixpkgs/commit/c0a8a9205b590828c2a174f751c80908e632f734 Author: Joachim Fasting Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M nixos/modules/rename.nix M nixos/modules/services/networking/dnscrypt-proxy.nix Log Message: --- nixos/dnscrypt-proxy: inline option renamings In an effort to make the module more self-contained. Commit: 5279ec111fef20a04155537ec19d8f5b36a4d50e https://github.com/NixOS/nixpkgs/commit/5279ec111fef20a04155537ec19d8f5b36a4d50e Author: Joachim Fasting Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M nixos/modules/services/networking/dnscrypt-proxy.xml Log Message: --- nixos/dnscrypt-proxy docs: reword section on forwarding Newer versions of DNSCrypt proxy *can* cache lookups (via plugin); make the wording more neutral wrt. why one might want to run the proxy in a forwarding setup. Commit: bb6361b81a1177a829fdcfb54e008840a87a17e6 https://github.com/NixOS/nixpkgs/commit/bb6361b81a1177a829fdcfb54e008840a87a17e6 Author: Joachim Fasting Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M nixos/modules/services/networking/dnscrypt-proxy.nix Log Message: --- nixos/dnscrypt-proxy: grant daemon access to load plugins Compare: https://github.com/NixOS/nixpkgs/compare/c863aa384e1a...bb6361b81a11___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] c863aa: cdparanoia: Fix aarch64 build
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: c863aa384e1a6237380afffd0feaf28b48983a23 https://github.com/NixOS/nixpkgs/commit/c863aa384e1a6237380afffd0feaf28b48983a23 Author: Tuomas TynkkynenDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/audio/cdparanoia/default.nix Log Message: --- cdparanoia: Fix aarch64 build Hooray for autohelltools actually reducing portability! ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] ac6baf: dd-agent: fix Python missing dependencies and vers...
Branch: refs/heads/release-17.03 Home: https://github.com/NixOS/nixpkgs Commit: ac6baf242ea0c65e19026ad0704716906d95209f https://github.com/NixOS/nixpkgs/commit/ac6baf242ea0c65e19026ad0704716906d95209f Author: Susan PotterDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/networking/dd-agent/default.nix M pkgs/top-level/all-packages.nix Log Message: --- dd-agent: fix Python missing dependencies and versions (cherry picked from commit 17a8d19032b45126e6ec3814e98d25dbe37a18be) Commit: a0ccb7019cd88062fa46644fcde7f601aefa7914 https://github.com/NixOS/nixpkgs/commit/a0ccb7019cd88062fa46644fcde7f601aefa7914 Author: Susan Potter Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/networking/dd-agent/default.nix M pkgs/top-level/all-packages.nix Log Message: --- dd-agent: 5.5.2 -> 5.11.2 (cherry picked from commit 35f9f63a39f24f8b7e68451d5860a74260b4e5f8) Compare: https://github.com/NixOS/nixpkgs/compare/f51f1670080a...a0ccb7019cd8___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 17a8d1: dd-agent: fix Python missing dependencies and vers...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 17a8d19032b45126e6ec3814e98d25dbe37a18be https://github.com/NixOS/nixpkgs/commit/17a8d19032b45126e6ec3814e98d25dbe37a18be Author: Susan PotterDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/networking/dd-agent/default.nix M pkgs/top-level/all-packages.nix Log Message: --- dd-agent: fix Python missing dependencies and versions Commit: 35f9f63a39f24f8b7e68451d5860a74260b4e5f8 https://github.com/NixOS/nixpkgs/commit/35f9f63a39f24f8b7e68451d5860a74260b4e5f8 Author: Susan Potter Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/networking/dd-agent/default.nix M pkgs/top-level/all-packages.nix Log Message: --- dd-agent: 5.5.2 -> 5.11.2 Compare: https://github.com/NixOS/nixpkgs/compare/262993d2b872...35f9f63a39f2___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 57486f: edward: init at 1.2.2
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 57486f21a3e5711ff3eaaad877ecd3781587f584 https://github.com/NixOS/nixpkgs/commit/57486f21a3e5711ff3eaaad877ecd3781587f584 Author: Ben DarwinDate: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: A pkgs/development/python-modules/edward/default.nix M pkgs/top-level/python-packages.nix Log Message: --- edward: init at 1.2.2 Commit: 262993d2b872201b2e765a48f8fd5d9bf7913f11 https://github.com/NixOS/nixpkgs/commit/262993d2b872201b2e765a48f8fd5d9bf7913f11 Author: Frederik Rietdijk Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: A pkgs/development/python-modules/edward/default.nix M pkgs/top-level/python-packages.nix Log Message: --- Merge pull request #23452 from bcdarwin/edward edward: init at 1.2.2 Compare: https://github.com/NixOS/nixpkgs/compare/96803574cd74...262993d2b872___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] acd8ed: atom: 1.14.4 -> 1.15.0
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: acd8ede120462c2682795a4dab3d10ba0a4385d0 https://github.com/NixOS/nixpkgs/commit/acd8ede120462c2682795a4dab3d10ba0a4385d0 Author: Gauthier POGAM--LE MONTAGNERDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/editors/atom/default.nix Log Message: --- atom: 1.14.4 -> 1.15.0 Commit: 96803574cd745586b97000bbf4d3a230adee9306 https://github.com/NixOS/nixpkgs/commit/96803574cd745586b97000bbf4d3a230adee9306 Author: Tim Steinbach Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/editors/atom/default.nix Log Message: --- Merge pull request #23712 from Kendos-Kenlen/atom atom: 1.14.4 -> 1.15.0 Compare: https://github.com/NixOS/nixpkgs/compare/985f54f5fc5b...96803574cd74___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] d12635: lxqt: fix qtsvg attribute
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: d12635370b4f4b35bedf1938975706b0ec7836f8 https://github.com/NixOS/nixpkgs/commit/d12635370b4f4b35bedf1938975706b0ec7836f8 Author: romildoDate: 2017-03-07 (Tue, 07 Mar 2017) Changed paths: M pkgs/desktops/lxqt/default.nix Log Message: --- lxqt: fix qtsvg attribute Commit: 985f54f5fc5bfedd3848215f167a17a7d02769f7 https://github.com/NixOS/nixpkgs/commit/985f54f5fc5bfedd3848215f167a17a7d02769f7 Author: Thomas Tuegel Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/desktops/lxqt/default.nix Log Message: --- Merge pull request #23588 from romildo/fix.lxqt lxqt: fix qtsvg attribute Compare: https://github.com/NixOS/nixpkgs/compare/4c0737eb80af...985f54f5fc5b___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] c663f6: qt57: darwin compatibility
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: c663f6aba91ad7a5ff778618a0d7a83f225e0955 https://github.com/NixOS/nixpkgs/commit/c663f6aba91ad7a5ff778618a0d7a83f225e0955 Author: Periklis TsirakidisDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/libraries/qt-5/5.7/default.nix A pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch M pkgs/development/libraries/qt-5/5.7/qtbase/default.nix M pkgs/development/libraries/qt-5/5.7/qtbase/series Log Message: --- qt57: darwin compatibility Port of the qt56 compatibility patch 7a9400d by @acowley Commit: 4c0737eb80af8a1e0c0bab4c51454807837dfdde https://github.com/NixOS/nixpkgs/commit/4c0737eb80af8a1e0c0bab4c51454807837dfdde Author: Thomas Tuegel Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/libraries/qt-5/5.7/default.nix A pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch M pkgs/development/libraries/qt-5/5.7/qtbase/default.nix M pkgs/development/libraries/qt-5/5.7/qtbase/series Log Message: --- Merge pull request #23602 from periklis/topic_qt57_darwin qt57: darwin compatibility Compare: https://github.com/NixOS/nixpkgs/compare/943c4ed72ff8...4c0737eb80af___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 66bc21: qtbase: don't patch non-existent .pc files on Darw...
Branch: refs/heads/staging Home: https://github.com/NixOS/nixpkgs Commit: 66bc2135f6c374ffba8e351a51a2d836a8da5d62 https://github.com/NixOS/nixpkgs/commit/66bc2135f6c374ffba8e351a51a2d836a8da5d62 Author: Thomas TuegelDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/libraries/qt-5/5.6/qtbase/default.nix M pkgs/development/libraries/qt-5/5.7/qtbase/default.nix M pkgs/development/libraries/qt-5/5.8/qtbase/default.nix Log Message: --- qtbase: don't patch non-existent .pc files on Darwin ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 943c4e: emem: 0.2.32 -> 0.2.34 (#23680)
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 943c4ed72ff85bb9a2610d8909ee68bb0f0d0744 https://github.com/NixOS/nixpkgs/commit/943c4ed72ff85bb9a2610d8909ee68bb0f0d0744 Author: Rommel M. MartinezDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/misc/emem/default.nix Log Message: --- emem: 0.2.32 -> 0.2.34 (#23680) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] c7d903: brscan4: 0.4.3-4 -> 0.4.4-2
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: c7d9032b510facf0cc1d55240df86c163b4a2161 https://github.com/NixOS/nixpkgs/commit/c7d9032b510facf0cc1d55240df86c163b4a2161 Author: Raymond GauthierDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/graphics/sane/backends/brscan4/default.nix Log Message: --- brscan4: 0.4.3-4 -> 0.4.4-2 Also add missing linux32 support. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] f51f16: brscan4: 0.4.3-4 -> 0.4.4-2
Branch: refs/heads/release-17.03 Home: https://github.com/NixOS/nixpkgs Commit: f51f1670080a483a6dda0d3404a175b2262218f7 https://github.com/NixOS/nixpkgs/commit/f51f1670080a483a6dda0d3404a175b2262218f7 Author: Raymond GauthierDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/graphics/sane/backends/brscan4/default.nix Log Message: --- brscan4: 0.4.3-4 -> 0.4.4-2 Also add missing linux32 support. (cherry picked from commit c7d9032b510facf0cc1d55240df86c163b4a2161) ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] cc7c3c: nixos/plasma5: set GST_PLUGIN_SYSTEM_PATH_1_0 to l...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: cc7c3c6bb84f0f235bf8c136995074cdf4ae89b5 https://github.com/NixOS/nixpkgs/commit/cc7c3c6bb84f0f235bf8c136995074cdf4ae89b5 Author: Thomas TuegelDate: 2017-03-04 (Sat, 04 Mar 2017) Changed paths: M nixos/modules/services/x11/desktop-managers/plasma5.nix Log Message: --- nixos/plasma5: set GST_PLUGIN_SYSTEM_PATH_1_0 to list of paths Commit: 5a05f6f48316f04904eabc9fdb411b093d59dc1c https://github.com/NixOS/nixpkgs/commit/5a05f6f48316f04904eabc9fdb411b093d59dc1c Author: Thomas Tuegel Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: A pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch M pkgs/development/libraries/phonon/backends/gstreamer.nix Log Message: --- phonon-backend-gstreamer: hardcode gstreamer plugin paths Commit: edd43351cfa861a5e641a4c25666bbd3bc181f67 https://github.com/NixOS/nixpkgs/commit/edd43351cfa861a5e641a4c25666bbd3bc181f67 Author: Thomas Tuegel Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M nixos/modules/services/x11/desktop-managers/plasma5.nix Log Message: --- nixos/plasma5: no need to set gstreamer plugin path Commit: 64b88c3017089c55bbf7fb272696f62a4369a187 https://github.com/NixOS/nixpkgs/commit/64b88c3017089c55bbf7fb272696f62a4369a187 Author: Thomas Tuegel Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M doc/languages-frameworks/python.md M lib/maintainers.nix M nixos/default.nix M nixos/doc/manual/configuration/xfce.xml M nixos/doc/manual/release-notes/rl-1703.xml M nixos/doc/manual/release-notes/rl-1709.xml M nixos/modules/config/fonts/fontconfig-ultimate.nix M nixos/modules/config/fonts/fontconfig.nix M nixos/modules/config/pulseaudio.nix M nixos/modules/installer/cd-dvd/iso-image.nix M nixos/modules/installer/tools/nixos-rebuild.sh M nixos/modules/misc/ids.nix M nixos/modules/module-list.nix M nixos/modules/rename.nix M nixos/modules/security/grsecurity.xml M nixos/modules/services/cluster/kubernetes.nix M nixos/modules/services/continuous-integration/buildbot/master.nix M nixos/modules/services/continuous-integration/buildbot/worker.nix M nixos/modules/services/continuous-integration/jenkins/job-builder.nix M nixos/modules/services/logging/fluentd.nix M nixos/modules/services/misc/nix-daemon.nix M nixos/modules/services/misc/ssm-agent.nix M nixos/modules/services/monitoring/das_watchdog.nix M nixos/modules/services/networking/btsync.nix M nixos/modules/services/networking/ddclient.nix M nixos/modules/services/networking/dnscrypt-proxy.nix M nixos/modules/services/networking/networkmanager.nix M nixos/modules/services/networking/searx.nix M nixos/modules/services/scheduling/fcron.nix M nixos/modules/services/web-servers/phpfpm/default.nix M nixos/modules/services/x11/desktop-managers/plasma5.nix M nixos/modules/services/x11/desktop-managers/xfce.nix A nixos/modules/services/x11/display-managers/xpra.nix M nixos/modules/services/x11/xserver.nix M nixos/modules/tasks/filesystems/zfs.nix M nixos/modules/tasks/network-interfaces-scripted.nix M nixos/modules/tasks/network-interfaces.nix M nixos/modules/virtualisation/ecs-agent.nix M nixos/modules/virtualisation/openstack/glance.nix M nixos/modules/virtualisation/virtualbox-guest.nix M nixos/modules/virtualisation/xen-dom0.nix A nixos/tests/buildbot.nix M nixos/tests/leaps.nix M nixos/tests/networking.nix M pkgs/applications/altcoins/dogecoin.nix M pkgs/applications/audio/bs1770gain/default.nix M pkgs/applications/audio/chuck/default.nix M pkgs/applications/audio/easytag/default.nix M pkgs/applications/audio/flacon/default.nix M pkgs/applications/audio/fmit/default.nix M pkgs/applications/audio/guitarix/default.nix M pkgs/applications/audio/hydrogen/default.nix M pkgs/applications/editors/eclipse/default.nix M pkgs/applications/editors/emacs-modes/elpa-generated.nix M pkgs/applications/editors/emacs-modes/melpa-generated.nix M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix M pkgs/applications/editors/geany/default.nix M pkgs/applications/editors/hexcurse/default.nix M pkgs/applications/editors/neovim/qt.nix M pkgs/applications/gis/qgis/default.nix M pkgs/applications/graphics/inkscape/default.nix M pkgs/applications/graphics/photivo/default.nix M pkgs/applications/graphics/shotwell/default.nix M pkgs/applications/kde/kdenlive.nix M pkgs/applications/misc/albert/default.nix M pkgs/applications/misc/cheat/default.nix M pkgs/applications/misc/emem/default.nix M pkgs/applications/misc/kiwix/default.nix M
[Nix-commits] [NixOS/nixpkgs] 7dcc40: networkmanagerapplet: add dconf and glib_networkin...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 7dcc40b674e98ef9216262a969888ca9342728de https://github.com/NixOS/nixpkgs/commit/7dcc40b674e98ef9216262a969888ca9342728de Author: Nikolay AmiantovDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/tools/networking/network-manager-applet/default.nix Log Message: --- networkmanagerapplet: add dconf and glib_networking Fixes #23700. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 76836e: obs-studio: 18.0.0 -> 18.0.1
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 76836ee2c7e127d632018ff6a8a4c4d063806716 https://github.com/NixOS/nixpkgs/commit/76836ee2c7e127d632018ff6a8a4c4d063806716 Author: Cray ElliottDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/video/obs-studio/default.nix A pkgs/applications/video/obs-studio/segfault-patch-systray.patch Log Message: --- obs-studio: 18.0.0 -> 18.0.1 also add patch to fix a segfault, submitted upstream to obs-studio ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 187372: luaPackages.mpack: enable darwin platform
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 1873721fcdcdd3a45294e873cef053878c10c20d https://github.com/NixOS/nixpkgs/commit/1873721fcdcdd3a45294e873cef053878c10c20d Author: zimbatmDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/top-level/lua-packages.nix Log Message: --- luaPackages.mpack: enable darwin platform It was working fine but then regressed by 77f5a50c400d7e312e7491593dcc8ee8cab86c2c ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 2e16a8: scudcloud: 1.40 -> 1.44
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: 2e16a8d9b37cee03f50efa058a0b0c56760d9352 https://github.com/NixOS/nixpkgs/commit/2e16a8d9b37cee03f50efa058a0b0c56760d9352 Author: Mikhail VolkhovDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/networking/instant-messengers/scudcloud/default.nix Log Message: --- scudcloud: 1.40 -> 1.44 AFAIU qt5 version was updated so older scudcloud was no longer working. This fixes the problem. Commit: 10a17f99a4de0cff8881375b3369562f1dcd16d9 https://github.com/NixOS/nixpkgs/commit/10a17f99a4de0cff8881375b3369562f1dcd16d9 Author: Arseniy Seroka Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/networking/instant-messengers/scudcloud/default.nix Log Message: --- Merge pull request #23698 from volhovM/update/scudcloud-1.44 scudcloud: 1.40 -> 1.44 Compare: https://github.com/NixOS/nixpkgs/compare/f3a4f31554f6...10a17f99a4de___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 49f5eb: Update python.md
Branch: refs/heads/qknight-overrideAttrs Home: https://github.com/NixOS/nixpkgs Commit: 49f5ebb2bac94173d1efd66556a90c53e558f279 https://github.com/NixOS/nixpkgs/commit/49f5ebb2bac94173d1efd66556a90c53e558f279 Author: Joachim SchieleDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M doc/languages-frameworks/python.md Log Message: --- Update python.md ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] d138b7: Update python.md
Branch: refs/heads/qknight-overrideAttrs Home: https://github.com/NixOS/nixpkgs Commit: d138b77917c2a9b7d6e58fb051aa0daee73eb295 https://github.com/NixOS/nixpkgs/commit/d138b77917c2a9b7d6e58fb051aa0daee73eb295 Author: Joachim SchieleDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M doc/languages-frameworks/python.md Log Message: --- Update python.md ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] e1fe2a: Update python.md
Branch: refs/heads/qknight-overrideAttrs Home: https://github.com/NixOS/nixpkgs Commit: e1fe2a83bdf08e3efcae42e50b899cfe7a5d32af https://github.com/NixOS/nixpkgs/commit/e1fe2a83bdf08e3efcae42e50b899cfe7a5d32af Author: Joachim SchieleDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M doc/languages-frameworks/python.md Log Message: --- Update python.md ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] 80d87c: Update python.md
Branch: refs/heads/qknight-overrideAttrs Home: https://github.com/NixOS/nixpkgs Commit: 80d87c95904d78709615c00b2f1ec274ab413299 https://github.com/NixOS/nixpkgs/commit/80d87c95904d78709615c00b2f1ec274ab413299 Author: Joachim SchieleDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M doc/languages-frameworks/python.md Log Message: --- Update python.md ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nixpkgs] ef3119: git-annex: Fetch from git, since 6.20170101.tar.gz...
Branch: refs/heads/release-16.09 Home: https://github.com/NixOS/nixpkgs Commit: ef31193d12e35e0b2b32d3facb740a0a69de190f https://github.com/NixOS/nixpkgs/commit/ef31193d12e35e0b2b32d3facb740a0a69de190f Author: Peter SimonsDate: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/haskell-modules/configuration-common.nix Log Message: --- git-annex: Fetch from git, since 6.20170101.tar.gz is gone. Commit: c88e67df6002e60627fa47932c4d990b5eca7ed3 https://github.com/NixOS/nixpkgs/commit/c88e67df6002e60627fa47932c4d990b5eca7ed3 Author: Peter Simons Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/development/haskell-modules/configuration-common.nix Log Message: --- Merge pull request #23691 from sh01/ga_cherrypick_16 git-annex: Fetch from git, since 6.20170101.tar.gz is gone. Compare: https://github.com/NixOS/nixpkgs/compare/f89ab94c23d1...c88e67df6002___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] fetchgit
Hi Profpatsch, Here is the tree of my private package: ./local/bcupkgs/ ├── default.nix └── pkgs ├── build-support │ └── fetchgit │ ├── builder.sh │ ├── default.nix │ └── nix-prefetch-git └── development └── libraries └── lima-core ├── 0001-removed-Python-modules-from-install.inc.patch ├── config.patch └── default.nix I've attached all the nix script I've wrote so fare. Thanks for your help, SEB On 03/09/2017 06:02 PM, Profpatsch wrote: > I cannot tell you anything without a patch or at least > a code sample. diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 4bbef1d..da46106 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -10,6 +10,7 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ ${deepClone:+--deepClone} \ ${fetchSubmodules:+--fetch-submodules} \ - ${branchName:+--branch-name "$branchName"} + ${branchName:+--branch-name "$branchName"} \ + ${submodulesList:+--submodules-list "$submodulesList"} stopNest diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 7f98c97..01f7da2 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -12,7 +12,8 @@ in "${if matched == null then base else builtins.head matched}${appendShort}"; in { url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? deepClone -, fetchSubmodules ? true, deepClone ? false +, fetchSubmodules ? true, submodulesList ? "" +, deepClone ? false , branchName ? null , name ? urlToName url rev }: @@ -52,7 +53,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = if sha256 == "" then md5 else sha256; - inherit url rev leaveDotGit fetchSubmodules deepClone branchName; + inherit url rev leaveDotGit fetchSubmodules submodulesList deepClone branchName; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 705d84c..52f6c4d 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -9,6 +9,7 @@ hashType=$NIX_HASH_ALGO deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT fetchSubmodules= +submodulesList= builder= branchName=$NIX_PREFETCH_GIT_BRANCH_NAME @@ -46,6 +47,7 @@ Options: --no-deepClone Make a shallow clone of just the required ref. --leave-dotGit Keep the .git directories. --fetch-submodules Fetch submodules. + --submodules-list list of submodules to fetch (empty means all). --builder Clone as fetchgit does, but url, rev, and out option are mandatory. " exit 1 @@ -66,6 +68,7 @@ for arg; do --no-deepClone) deepClone=false;; --leave-dotGit) leaveDotGit=true;; --fetch-submodules) fetchSubmodules=true;; + --submodules-list) argfun=submodulesList;; --builder) builder=true;; --help) usage; exit;; *) @@ -84,6 +87,9 @@ for arg; do var=${argfun#set_} eval $var=$arg ;; + submodulesList) + submodulesList="$arg" + ;; esac argfun="" fi @@ -186,12 +192,15 @@ init_submodules(){ # checkout each submodule hash=$(echo "$l" | awk '{print substr($1,2)}') dir=$(echo "$l" | awk '{print $2}') -name=$( -git config -f .gitmodules --get-regexp submodule\..*\.path | -sed -n "s,^\(.*\)\.path $dir\$,\\1,p") -url=$(git config --get "${name}.url") - -clone "$dir" "$url" "$hash" "" + match=$(echo $submodulesList|grep $dir || true) + if [ -z "$submodulesList" ] || [ -n "$match" ] ; then + name=$( + git config -f .gitmodules --get-regexp submodule\..*\.path | + sed -n "s,^\(.*\)\.path $dir\$,\\1,p") + url=$(git config --get "${name}.url") + + clone "$dir" "$url" "$hash" "" + fi done } { system ? builtins.currentSystem}: let pkgs = import { inherit system; }; callPackage = pkgs.lib.callPackageWith (pkgs // bcuPackages); callPackages = pkgs.lib.callPackagesWith (pkgs // bcuPackages); python27Packages = pkgs.recurseIntoAttrs ( callPackage ./python_packages.nix { python = pkgs.python27; self = combinedPythonPackages; }); pythonPackages = python27Packages; combinedPythonPackages = pkgs.python27Packages // python27Packages // bcuPackages; bcuPackages = { tango = callPackage ./pkgs/development/libraries/tango {}; pytango = pythonPackages.pytango; inherit (callPackages ./pkgs/tools/package-management/nix-prefetch-scripts { }) nix-prefetch-git
[Nix-commits] [NixOS/nixpkgs] f3a4f3: libreoffice-still: apply the patch for ICU 58, see...
Branch: refs/heads/master Home: https://github.com/NixOS/nixpkgs Commit: f3a4f31554f655440181aa6085ed7fea5b4c24e4 https://github.com/NixOS/nixpkgs/commit/f3a4f31554f655440181aa6085ed7fea5b4c24e4 Author: Michael Raskin <7c6f4...@mail.ru> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M pkgs/applications/office/libreoffice/still.nix M pkgs/top-level/all-packages.nix Log Message: --- libreoffice-still: apply the patch for ICU 58, see 17126 ___ 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: aszligDate: 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 ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits