Branch: refs/heads/staging-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7f172a4c573587eb8478a82327b26e5b517a7ea8
      
https://github.com/NixOS/nixpkgs/commit/7f172a4c573587eb8478a82327b26e5b517a7ea8
  Author: Orivej Desh <[email protected]>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M nixos/modules/installer/cd-dvd/iso-image.nix

  Log Message:
  -----------
  nixos/iso-image: support boot from USB disks

(cherry picked from commit 838051e9cd7a76b93cf94c10d8728c2faca23cdc)


  Commit: f84dcaa9d2ac43a29dc1f071613a75b35c742781
      
https://github.com/NixOS/nixpkgs/commit/f84dcaa9d2ac43a29dc1f071613a75b35c742781
  Author: edef <[email protected]>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M pkgs/applications/science/electronics/verilator/default.nix

  Log Message:
  -----------
  verilator: fix Perl shebangs

(cherry picked from commit 2c02c84cdceea6aebba06502cc740ab69e69bd5f)


  Commit: 0dd1ecef35574fab5bce9dbb1a8c3cd94e253105
      
https://github.com/NixOS/nixpkgs/commit/0dd1ecef35574fab5bce9dbb1a8c3cd94e253105
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M pkgs/servers/dns/knot-resolver/default.nix

  Log Message:
  -----------
  knot-resolver: maintenance 1.2.3 -> 1.2.4

(cherry picked from commit 74f92e95562c1dea4791c648fe4a4d9a70b2fd2a)


  Commit: b77a47dbef1e324cdcb603eeeac6b479b2ae9f4f
      
https://github.com/NixOS/nixpkgs/commit/b77a47dbef1e324cdcb603eeeac6b479b2ae9f4f
  Author: rnhmjoj <[email protected]>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M pkgs/development/libraries/libpcap/default.nix

  Log Message:
  -----------
  libpcap: fix missing remote-ext.h error

(cherry picked from commit 4c33ea35b70fb222aa61f5f1c50d074b6df3e8fc)


  Commit: a7e26c9d9bc6fb275d6e5faf9a7bf58c17b5ef49
      
https://github.com/NixOS/nixpkgs/commit/a7e26c9d9bc6fb275d6e5faf9a7bf58c17b5ef49
  Author: rnhmjoj <[email protected]>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M pkgs/applications/networking/ostinato/default.nix

  Log Message:
  -----------
  ostinato: refactor

(cherry picked from commit 16651026882e9e6c74d520be386d4eada09fb572)


  Commit: 804329a5ab46b9981e59c8698008766339d4c04a
      
https://github.com/NixOS/nixpkgs/commit/804329a5ab46b9981e59c8698008766339d4c04a
  Author: Lancelot SIX <[email protected]>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M pkgs/applications/gis/qgis/default.nix

  Log Message:
  -----------
  qgis: 2.18.3 -> 2.18.4

(cherry picked from commit be2019570444e6442fc2aee3c53a70ff546042bc)


  Commit: 1d92624ec2669408cecee005f26485bbf04ac95e
      
https://github.com/NixOS/nixpkgs/commit/1d92624ec2669408cecee005f26485bbf04ac95e
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M pkgs/development/libraries/mesa/default.nix

  Log Message:
  -----------
  Merge older staging-17.03 into release-17.03

Done more testing of the mesa bump; Hydra looks OK.


  Commit: b8df6bebb079bc935740a89e833aee50d8cf540c
      
https://github.com/NixOS/nixpkgs/commit/b8df6bebb079bc935740a89e833aee50d8cf540c
  Author: Tuomas Tynkkynen <[email protected]>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M pkgs/servers/http/pshs/default.nix

  Log Message:
  -----------
  pshs: 0.3 -> 0.3.1, fix source location

(cherry picked from commit fe20a3275154c6425cbb63434a7e2f98f65804f6)


  Commit: 8af59cfa04e8f7da9971b3556cfe687a8bad0d3b
      
https://github.com/NixOS/nixpkgs/commit/8af59cfa04e8f7da9971b3556cfe687a8bad0d3b
  Author: Tuomas Tynkkynen <[email protected]>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M pkgs/tools/security/john/default.nix

  Log Message:
  -----------
  john: Disable parallel build

http://hydra.nixos.org/build/49940032/nixlog/1/raw
(cherry picked from commit e7ce27f9ce47bd87f8580f27583f98d29be9e4bf)


  Commit: d2a52af05cb87297aed9a8d434ef6a5e5942fa13
      
https://github.com/NixOS/nixpkgs/commit/d2a52af05cb87297aed9a8d434ef6a5e5942fa13
  Author: Tuomas Tynkkynen <[email protected]>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M pkgs/development/tools/simavr/default.nix

  Log Message:
  -----------
  simavr: Disable parallel build

http://hydra.nixos.org/build/49945319/nixlog/1/raw
(cherry picked from commit 5bb99ca0f6e5853ec2628fbae0e764ae122af1d3)


  Commit: ab0824edf8ed636d11a04ffdb9f99076f30dfd2c
      
https://github.com/NixOS/nixpkgs/commit/ab0824edf8ed636d11a04ffdb9f99076f30dfd2c
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
    M pkgs/applications/networking/mailreaders/thunderbird/default.nix

  Log Message:
  -----------
  Merge #23663: thunderbird*: security 45.7.1 -> 45.8.0

(cherry picked from commit 7b7496a256bff538d7fcb4d8ab637d553671388c)


  Commit: 064cda9b1af515efe971fcb19c55dc21a1dd7131
      
https://github.com/NixOS/nixpkgs/commit/064cda9b1af515efe971fcb19c55dc21a1dd7131
  Author: Peter Hoeg <[email protected]>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M pkgs/applications/networking/dropbox/default.nix

  Log Message:
  -----------
  dropbox: 20.4.19 -> 21.4.25

(cherry picked from commit bb1496332ed66dbbd851fa13bf52929e384d1e32)


  Commit: 39691e1c39f6cd4fcfa1d681b23c159a5e2b7a4c
      
https://github.com/NixOS/nixpkgs/commit/39691e1c39f6cd4fcfa1d681b23c159a5e2b7a4c
  Author: Nikolay Amiantov <[email protected]>
  Date:   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.

(cherry picked from commit 7dcc40b674e98ef9216262a969888ca9342728de)


  Commit: f51f1670080a483a6dda0d3404a175b2262218f7
      
https://github.com/NixOS/nixpkgs/commit/f51f1670080a483a6dda0d3404a175b2262218f7
  Author: Raymond Gauthier <[email protected]>
  Date:   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)


  Commit: ac6baf242ea0c65e19026ad0704716906d95209f
      
https://github.com/NixOS/nixpkgs/commit/ac6baf242ea0c65e19026ad0704716906d95209f
  Author: Susan Potter <[email protected]>
  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: fix Python missing dependencies and versions

(cherry picked from commit 17a8d19032b45126e6ec3814e98d25dbe37a18be)


  Commit: a0ccb7019cd88062fa46644fcde7f601aefa7914
      
https://github.com/NixOS/nixpkgs/commit/a0ccb7019cd88062fa46644fcde7f601aefa7914
  Author: Susan Potter <[email protected]>
  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)


  Commit: 952e7f3910500d5c840b52713f293027607c3ca3
      
https://github.com/NixOS/nixpkgs/commit/952e7f3910500d5c840b52713f293027607c3ca3
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/applications/networking/instant-messengers/pidgin/default.nix

  Log Message:
  -----------
  pidgin: 2.11.0 -> 2.12.0 for CVE-2017-2640

Also removes unmaintained plugins.

See https://bitbucket.org/pidgin/www/src/tip/htdocs/ChangeLog.

(cherry picked from commit 4e0375cb59b80934ab55a3fe523979c5f2e81640)


  Commit: 57e693ca43e6aaa51d20f8b3a09ff0be6f5263f1
      
https://github.com/NixOS/nixpkgs/commit/57e693ca43e6aaa51d20f8b3a09ff0be6f5263f1
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/os-specific/linux/lxc/default.nix

  Log Message:
  -----------
  lxc: add patch for CVE-2017-5985

(cherry picked from commit 3bd44428cfa0a9f2fe8d1eae62b105e7a5dace86)


  Commit: 50586f2441366c811af6e48a47a4bb17f43c36a7
      
https://github.com/NixOS/nixpkgs/commit/50586f2441366c811af6e48a47a4bb17f43c36a7
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/os-specific/linux/kernel/linux-3.12.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  linux: 3.12.70 -> 3.12.71

(cherry picked from commit ff2313a6c62c471f06a01739a05b799b28707a23)


  Commit: 641ad2e922a515d241698f0f3b053872261ae97a
      
https://github.com/NixOS/nixpkgs/commit/641ad2e922a515d241698f0f3b053872261ae97a
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/applications/virtualization/qemu/default.nix

  Log Message:
  -----------
  qemu: add patches for multiple CVEs

New upstream patch function and patches for fixing a bug in the patch for
CVE-2017-5667 and the following security issues:

  * CVE-2016-7907
  * CVE-2016-9602
  * CVE-2016-10155
  * CVE-2017-2620
  * CVE-2017-2630
  * CVE-2017-5525
  * CVE-2017-5526
  * CVE-2017-5579
  * CVE-2017-5856
  * CVE-2017-5857
  * CVE-2017-5987
  * CVE-2017-6058

(cherry picked from commit c512180f9c175c1fae1387b3879ede6d55d0dbe0)


  Commit: c554cbf8c25b7b26317a649a184b52182e2c4a04
      
https://github.com/NixOS/nixpkgs/commit/c554cbf8c25b7b26317a649a184b52182e2c4a04
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/tools/networking/wget/default.nix

  Log Message:
  -----------
  wget: add patch for CVE-2017-6508

(cherry picked from commit 39e8db7849ceb14e4d234436abb760dd7f3a8cb7)


  Commit: 8be6bebec1e33861dccd626af7807687aa7176fe
      
https://github.com/NixOS/nixpkgs/commit/8be6bebec1e33861dccd626af7807687aa7176fe
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/applications/virtualization/qemu/default.nix

  Log Message:
  -----------
  qemu: fetch vnc bugfix patch from debian

This version of the patch applies cleanly to the 2.8.0 release.

(cherry picked from commit 621e7a99457e295d6bfa51e0489584a7d7f5b167)


  Commit: 55e094c482fb6a503b3fe66eeac6f8fbc6c57b9f
      
https://github.com/NixOS/nixpkgs/commit/55e094c482fb6a503b3fe66eeac6f8fbc6c57b9f
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M nixos/modules/services/web-servers/phpfpm/default.nix

  Log Message:
  -----------
  phpfpm module: set correct nixos sendmail path

(cherry picked from commit 323d0fdd5a6e1a47ab9da72d15ed9872625fe8a0)


  Commit: f2c121f3ffbac9045095d5738a8534b58c97cdfa
      
https://github.com/NixOS/nixpkgs/commit/f2c121f3ffbac9045095d5738a8534b58c97cdfa
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/os-specific/linux/batman-adv/alfred.nix
    M pkgs/os-specific/linux/batman-adv/batctl.nix
    M pkgs/os-specific/linux/batman-adv/default.nix

  Log Message:
  -----------
  batman-adv: 2016.5 -> 2017.0.1

(cherry picked from commit 71161443b44dcf21e0bec919cdd602d3e7e05893)


  Commit: 543eeae23d71fd49ac05e08d30e53eaf54483b3b
      
https://github.com/NixOS/nixpkgs/commit/543eeae23d71fd49ac05e08d30e53eaf54483b3b
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/applications/virtualization/qemu/default.nix

  Log Message:
  -----------
  qemu_test: don't apply patch for CVE-2016-9602

Both patches are conflicting. Keeping the vulnerability unpatched in qemu
binaries used for nixos test is tolerable.

(cherry picked from commit 3a4e2376e444fd7664102af00a34c65b47e271ec)


  Commit: ae81e79c102176c7cdf1434db1cb40ac090060ef
      
https://github.com/NixOS/nixpkgs/commit/ae81e79c102176c7cdf1434db1cb40ac090060ef
  Author: Gregor Kleen <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M nixos/modules/services/monitoring/das_watchdog.nix

  Log Message:
  -----------
  das_watchdog: fix service type

(cherry picked from commit 899fd868ea49d9a9835821f60ea58e8e701e280e)


  Commit: 8106e0f3a29242574ac6aed915c0337b2f48112a
      
https://github.com/NixOS/nixpkgs/commit/8106e0f3a29242574ac6aed915c0337b2f48112a
  Author: Joachim Fasting <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/development/python-modules/pep257.nix

  Log Message:
  -----------
  pythonPackages.pep257: meta.lecense -> license

(cherry picked from commit ba499aa845fc907844b84e90a630aaaf5149cead)


  Commit: ead8fb7e8a0dba6054de7813af5cc5cd71ca2a89
      
https://github.com/NixOS/nixpkgs/commit/ead8fb7e8a0dba6054de7813af5cc5cd71ca2a89
  Author: Joachim Fasting <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/development/tools/vndr/default.nix

  Log Message:
  -----------
  vndr: meta.licence -> license

(cherry picked from commit 5bf3b4c7ff2531f2cf6c2a53d9caa0d6746e1c48)


  Commit: 1712e583e761c22c498abf9b885aff7b3cf92864
      
https://github.com/NixOS/nixpkgs/commit/1712e583e761c22c498abf9b885aff7b3cf92864
  Author: Robin Gloster <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/development/libraries/audio/suil/default.nix

  Log Message:
  -----------
  suil-qt5: fix build

(cherry picked from commit 91bbd73ffa7e70f0b1294a12bda6be63dae0fb95)


  Commit: e60ab0c2aa32e65691fa6064836573926f7f1edf
      
https://github.com/NixOS/nixpkgs/commit/e60ab0c2aa32e65691fa6064836573926f7f1edf
  Author: Robin Gloster <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/applications/display-managers/lightdm/default.nix

  Log Message:
  -----------
  lightdm_qt: fix build

(cherry picked from commit d6d796812a388be1461eb624cfde60b1036c585a)


  Commit: 56f3c6b10a48c60d3b6cc201640d23949aa1345a
      
https://github.com/NixOS/nixpkgs/commit/56f3c6b10a48c60d3b6cc201640d23949aa1345a
  Author: Robin Gloster <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/development/libraries/msilbc/default.nix

  Log Message:
  -----------
  msilbc: fix build

(cherry picked from commit 330b0d194600001251170f66b335c2ef89b7a432)


  Commit: 907a1f03b2b905af4c53c9e804194085f75a90f5
      
https://github.com/NixOS/nixpkgs/commit/907a1f03b2b905af4c53c9e804194085f75a90f5
  Author: Franz Pletz <[email protected]>
  Date:   2017-03-11 (Sat, 11 Mar 2017)

  Changed paths:
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix

  Log Message:
  -----------
  firmwareLinuxNonfree: 2017-02-06 -> 2017-03-11

Fixes #22365.

(cherry picked from commit c3c69535aa9f18f611950655d2e8ffc82521943d)


  Commit: 68cc97d306d3187c142cfb2378852f28d47bc098
      
https://github.com/NixOS/nixpkgs/commit/68cc97d306d3187c142cfb2378852f28d47bc098
  Author: Tuomas Tynkkynen <[email protected]>
  Date:   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.

(cherry picked from commit 77c49794cd773d8a20f61b28d430c9673d5452fe)


  Commit: 4d25eaafa77df94b8823245d43200818f2167dd2
      
https://github.com/NixOS/nixpkgs/commit/4d25eaafa77df94b8823245d43200818f2167dd2
  Author: zetok <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M nixos/modules/security/grsecurity.xml

  Log Message:
  -----------
  gresecurity docs: fix incorrect option (#23789)

(cherry picked from commit 4ca17dd6c099792f64399b2e9bd5b173ecee762f)


  Commit: 1f86d1d5bb0088df8e73d0803540b8da0409048c
      
https://github.com/NixOS/nixpkgs/commit/1f86d1d5bb0088df8e73d0803540b8da0409048c
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-nix.nix

  Log Message:
  -----------
  haskellPackages.llvm-general-darwin: fix #23794

by hiding under llvm-general.  There seems no use in a separately named
attribute.  The derivations are unchanged.

(cherry picked from commit 69448187a47619f60f6506e3c96e36aed073e491)


  Commit: b45aee491fbd2a9493d4726c955360e60c2a5754
      
https://github.com/NixOS/nixpkgs/commit/b45aee491fbd2a9493d4726c955360e60c2a5754
  Author: Thomas Tuegel <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/applications/kde/default.nix
    A pkgs/applications/kde/kcachegrind.nix

  Log Message:
  -----------
  Merge pull request #23766 from orivej/kcachegrind-kdelibs

kcachegrind: init at 16.2.2

(cherry picked from commit 28e78fd3dcf330ff9293b9acc9a45cdb1c4df257)
It's just adding a new package (back).


  Commit: 463eb1649f0c1a494a92ffeb83f7f0241e16f3ee
      
https://github.com/NixOS/nixpkgs/commit/463eb1649f0c1a494a92ffeb83f7f0241e16f3ee
  Author: ndowens <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/development/libraries/drumstick/default.nix

  Log Message:
  -----------
  drumstick: 1.0.2 -> 1.1.0

(cherry picked from commit 45cfd3969ae954da8b7f804df6e9ec2833c5eb7f)


  Commit: 537aa63248550112deb99bc2f9c3f2773f419442
      
https://github.com/NixOS/nixpkgs/commit/537aa63248550112deb99bc2f9c3f2773f419442
  Author: Joachim Fasting <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/patches.nix

  Log Message:
  -----------
  grsecurity: 4.9.13-201703052141 -> 4.9.14-201703121245

(cherry picked from commit 4c211bdc635358c2888afb8371f8a7854bb14403)


  Commit: 74c77fa944c78a823d837eb660ac504270b5933f
      
https://github.com/NixOS/nixpkgs/commit/74c77fa944c78a823d837eb660ac504270b5933f
  Author: Joachim Fasting <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/os-specific/linux/kernel/linux-4.9.nix

  Log Message:
  -----------
  linux_4_9: 4.9.13 -> 4.9.14

(cherry picked from commit 8091c1b208a439c068300b7c564ea8470445dd21)


  Commit: 03938aa359bcf812f7bb8f4c7a6f4bc2d84034a4
      
https://github.com/NixOS/nixpkgs/commit/03938aa359bcf812f7bb8f4c7a6f4bc2d84034a4
  Author: Nikolay Amiantov <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/development/libraries/dbus/make-session-conf.xsl

  Log Message:
  -----------
  makeDBusConf: re-add XDG directories for session bus

Fixes #23770.

(cherry picked from commit c05ac3ea126300ee65345bd0b07ab212aa9b5f6a)


  Commit: a99e4f28e95f51a7869a2f95abd7a98bff7093b0
      
https://github.com/NixOS/nixpkgs/commit/a99e4f28e95f51a7869a2f95abd7a98bff7093b0
  Author: Rodney Lorrimar <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/development/compilers/scala/default.nix

  Log Message:
  -----------
  scala: put docs in correct subdirectory

Under NixOS, /run/current-system/sw/share/doc was getting the license
file, etc.

(cherry picked from commit e333a71478730c63510b48131282f97b5e9c1af9)


  Commit: d44bf4c937767f5626a745ee4233eddebb830ced
      
https://github.com/NixOS/nixpkgs/commit/d44bf4c937767f5626a745ee4233eddebb830ced
  Author: c74d <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/tools/text/ripgrep/default.nix

  Log Message:
  -----------
  ripgrep: install man-page

Modify the `ripgrep` package to install the tool's manual page.

I have tested this commit per nixpkgs manual section 11.1 ("Making
patches").

(cherry picked from commit a856dd50b5e9d7f4de1acd158c4ae548f6de86be)


  Commit: 903700188019870e8bfb0a321715e1f480d874da
      
https://github.com/NixOS/nixpkgs/commit/903700188019870e8bfb0a321715e1f480d874da
  Author: obadz <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/development/compilers/coreclr/default.nix

  Log Message:
  -----------
  coreclr: mark broken

(cherry picked from commit 1dd16a93741c425880ac81d1e611af7be050c96b)


  Commit: a3939d186dae4acf5d5669b2e340d7923dc7c142
      
https://github.com/NixOS/nixpkgs/commit/a3939d186dae4acf5d5669b2e340d7923dc7c142
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/development/interpreters/clisp/hg.nix

  Log Message:
  -----------
  clisp-tip: make the build more reliable

Hydra shows it sometimes fails without autoconf:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.clisp-tip.x86_64-linux
I can't say I understand why this happened.

(cherry picked from commit 848423f2234fc3e008799ca9475d7a164164cac8)
/cc #23253 and maintainers @7c6f434c, @tohl.


  Commit: e47b819ef1a807e06d418ed892728efd47f9d9e6
      
https://github.com/NixOS/nixpkgs/commit/e47b819ef1a807e06d418ed892728efd47f9d9e6
  Author: Kranium Gikos Mendoza <[email protected]>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    M pkgs/servers/asterisk/default.nix

  Log Message:
  -----------
  asterisk: use fetchsvn for vendored library

(cherry picked from commit ac61ddef8ff6509549b0f8da588e668cadcf49bf)
/cc #23124, #23253.  It failed to build otherwise.


  Commit: 0af596f21e173e5c412deca6a25014a858e7765b
      
https://github.com/NixOS/nixpkgs/commit/0af596f21e173e5c412deca6a25014a858e7765b
  Author: tv <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M pkgs/servers/mail/exim/default.nix

  Log Message:
  -----------
  exim: 4.88 -> 4.89 (#23670)

(cherry picked from commit ba0b527456ac6885f0dd4a287d028384ffbf82b2)
Contains multiple bug fixes.


  Commit: 08381c07e0c702a52d26d4f913db013099526301
      
https://github.com/NixOS/nixpkgs/commit/08381c07e0c702a52d26d4f913db013099526301
  Author: José Romildo Malaquias <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M pkgs/applications/networking/p2p/qbittorrent/default.nix

  Log Message:
  -----------
  qbittorrent: 3.3.10 -> 3.3.11 (#23703)

(cherry picked from commit 196f64d6756b1aa1a3a74c2eea35dbe1d15504fd)
Fixes a number of bugs, including some security issues with the
web interface.


  Commit: 80345b551aef3eb2bbbf970dd67550d0ef7f331e
      
https://github.com/NixOS/nixpkgs/commit/80345b551aef3eb2bbbf970dd67550d0ef7f331e
  Author: José Romildo Malaquias <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M pkgs/desktops/enlightenment/enlightenment.nix

  Log Message:
  -----------
  enlightenment: 0.21.5 -> 0.21.7 (#23791)

(cherry picked from commit 16023ef5984153febd0cca71e9848ebed6874799)
Bug fix/stability release for 0.21.x


  Commit: 321481b4d582cf4cc72aceff3c6f7fbad10f1dfa
      
https://github.com/NixOS/nixpkgs/commit/321481b4d582cf4cc72aceff3c6f7fbad10f1dfa
  Author: Rodney Lorrimar <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M pkgs/development/node-packages/node-env.nix

  Log Message:
  -----------
  nodePackages: support github:owner/repo scheme for package deps

JS devs found a new way to be annoying - adjust code accordingly.

Have also put this change in PR svanderburg/node2nix#40

(cherry picked from commit 453529bd605a473b44802f8ac1df077ac98bf456)


  Commit: 6866170eaa3a1f7e6d90dbebdb303cdf19e72844
      
https://github.com/NixOS/nixpkgs/commit/6866170eaa3a1f7e6d90dbebdb303cdf19e72844
  Author: Rodney Lorrimar <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M pkgs/servers/web-apps/pump.io/generate.sh
    M pkgs/servers/web-apps/pump.io/node-packages.nix

  Log Message:
  -----------
  pump.io: 1.0.0 -> 3.0.0

The package stopped building for some unknown reason (npm could no
longer fetch a module).

This is one of the build failures listed in #23253.

    http://hydra.nixos.org/build/49551309
    http://hydra.nixos.org/build/49548753

Easiest fix is to upgrade to latest stable version and regenerate
packages with node2nix.

The databank-memcached dependency needed to be dropped due to
dependency failures.

(cherry picked from commit 252e58a95e395d34a8d3925639ba565d0632eaf8)


  Commit: bb8dd2f2d09147b33f2abc47c4d214cf53ec8baf
      
https://github.com/NixOS/nixpkgs/commit/bb8dd2f2d09147b33f2abc47c4d214cf53ec8baf
  Author: Rodney Lorrimar <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M nixos/modules/services/web-apps/pump.io.nix

  Log Message:
  -----------
  pumpio service: adjust upload directory config for 3.0.0

These changes are backwards compatible.

(cherry picked from commit f1a1490135aaf4d2f1fe9b4001cc40718c6ebf2a)


  Commit: b5009c2cf11d630146d3acfd8c1eaef415456fc1
      
https://github.com/NixOS/nixpkgs/commit/b5009c2cf11d630146d3acfd8c1eaef415456fc1
  Author: Rodney Lorrimar <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    A nixos/modules/services/web-apps/pump.io-configure.js
    M nixos/modules/services/web-apps/pump.io.nix

  Log Message:
  -----------
  pumpio service: don't keep secrets in nix store

Added extra config options to allow reading passwords from file rather
than the world-readable nix store.

The full config.json file is created at service startup.

Relevant to #18881

(cherry picked from commit f488b1811bf0ee1430ce728d661830e55abef88c)


  Commit: f7cbccbf42e4a02ebe15fd454204c35a183db4ac
      
https://github.com/NixOS/nixpkgs/commit/f7cbccbf42e4a02ebe15fd454204c35a183db4ac
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M nixos/tests/pump.io.nix

  Log Message:
  -----------
  pump.io: fix tests

fixes #23568

(cherry picked from commit 41625dcab64efe29c3b15876f27ec520927367bf)


  Commit: a83862ef101ff44b7eb9a09f1daec0bbe76fcc81
      
https://github.com/NixOS/nixpkgs/commit/a83862ef101ff44b7eb9a09f1daec0bbe76fcc81
  Author: Joachim Fasting <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M pkgs/development/compilers/tinycc/default.nix

  Log Message:
  -----------
  tinycc: 0.9.27pre-20170220 -> 20170225

Contains a fix for x86-64 asm gen and unified cross-compilation.

(cherry picked from commit 3c37edb928a5bbbb69603ac43c7b810fd6bc738d)


  Commit: 63ae3f061afb42633975b965249db27c3bc4e911
      
https://github.com/NixOS/nixpkgs/commit/63ae3f061afb42633975b965249db27c3bc4e911
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M pkgs/development/libraries/gnutls/3.5.nix
    M pkgs/development/libraries/gnutls/generic.nix

  Log Message:
  -----------
  gnutls: bugfix+security 3.5.9 -> 3.5.10

http://gnutls.org/security.html#GNUTLS-SA-2017-3
(cherry picked from commit b264486cf11b5b5946a0c1ad73610a9f80f520a5)


  Commit: ed509de913d97aaaa1be3d17b5821bbde6becea2
      
https://github.com/NixOS/nixpkgs/commit/ed509de913d97aaaa1be3d17b5821bbde6becea2
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M nixos/modules/installer/cd-dvd/iso-image.nix
    M nixos/modules/security/grsecurity.xml
    M nixos/modules/services/monitoring/das_watchdog.nix
    A nixos/modules/services/web-apps/pump.io-configure.js
    M nixos/modules/services/web-apps/pump.io.nix
    M nixos/modules/services/web-servers/phpfpm/default.nix
    M nixos/tests/pump.io.nix
    M pkgs/applications/display-managers/lightdm/default.nix
    M pkgs/applications/gis/qgis/default.nix
    M pkgs/applications/graphics/sane/backends/brscan4/default.nix
    M pkgs/applications/kde/default.nix
    A pkgs/applications/kde/kcachegrind.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/instant-messengers/pidgin/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
    M pkgs/applications/networking/mailreaders/thunderbird/default.nix
    M pkgs/applications/networking/ostinato/default.nix
    M pkgs/applications/networking/p2p/qbittorrent/default.nix
    M pkgs/applications/science/electronics/verilator/default.nix
    M pkgs/applications/virtualization/qemu/default.nix
    M pkgs/desktops/enlightenment/enlightenment.nix
    M pkgs/development/compilers/coreclr/default.nix
    M pkgs/development/compilers/scala/default.nix
    M pkgs/development/compilers/tinycc/default.nix
    M pkgs/development/haskell-modules/configuration-nix.nix
    M pkgs/development/interpreters/clisp/hg.nix
    M pkgs/development/libraries/audio/suil/default.nix
    M pkgs/development/libraries/dbus/make-session-conf.xsl
    M pkgs/development/libraries/drumstick/default.nix
    M pkgs/development/libraries/libpcap/default.nix
    M pkgs/development/libraries/msilbc/default.nix
    M pkgs/development/node-packages/node-env.nix
    M pkgs/development/python-modules/pep257.nix
    M pkgs/development/tools/simavr/default.nix
    M pkgs/development/tools/vndr/default.nix
    M pkgs/os-specific/linux/batman-adv/alfred.nix
    M pkgs/os-specific/linux/batman-adv/batctl.nix
    M pkgs/os-specific/linux/batman-adv/default.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    M pkgs/os-specific/linux/kernel/linux-3.12.nix
    M pkgs/os-specific/linux/kernel/linux-4.9.nix
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/linux-testing.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/lxc/default.nix
    M pkgs/servers/asterisk/default.nix
    M pkgs/servers/dns/knot-resolver/default.nix
    M pkgs/servers/http/pshs/default.nix
    M pkgs/servers/mail/exim/default.nix
    M pkgs/servers/web-apps/pump.io/generate.sh
    M pkgs/servers/web-apps/pump.io/node-packages.nix
    M pkgs/tools/networking/dd-agent/default.nix
    M pkgs/tools/networking/network-manager-applet/default.nix
    M pkgs/tools/networking/wget/default.nix
    M pkgs/tools/security/john/default.nix
    M pkgs/tools/text/ripgrep/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge branch 'release-17.03' into staging-17.03


Compare: https://github.com/NixOS/nixpkgs/compare/328eb9da7caf...ed509de913d9
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to