Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0063c8acb4a5de8d90c0cbadf54ce337bd921e76
      
https://github.com/NixOS/nixpkgs/commit/0063c8acb4a5de8d90c0cbadf54ce337bd921e76
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
    M pkgs/tools/archivers/p7zip/default.nix
    A pkgs/tools/archivers/p7zip/setup-hook.sh

  Log Message:
  -----------
  p7zip: add setup hook


  Commit: 60903f7320cdfc517a23ce80a0c21a31d4a2eee9
      
https://github.com/NixOS/nixpkgs/commit/60903f7320cdfc517a23ce80a0c21a31d4a2eee9
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
    M pkgs/games/gzdoom/default.nix

  Log Message:
  -----------
  gzdoom: 2015-05-07 -> 2.2.0


  Commit: 1cc9d9ef2ce80dee5c8f2ef9f8ae20ae76337d73
      
https://github.com/NixOS/nixpkgs/commit/1cc9d9ef2ce80dee5c8f2ef9f8ae20ae76337d73
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
    M pkgs/games/zdoom/default.nix

  Log Message:
  -----------
  zdoom: 2.7.1 -> 2.8.1


  Commit: dca2e720bc2882edfa6589abe2fea0392e200519
      
https://github.com/NixOS/nixpkgs/commit/dca2e720bc2882edfa6589abe2fea0392e200519
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
    M pkgs/games/zandronum/default.nix
    A pkgs/games/zandronum/fmod.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  zandronum: bundle fmod, fix libraries


  Commit: 18d42e1aa526cb9a28b1f4e4907665abf050c039
      
https://github.com/NixOS/nixpkgs/commit/18d42e1aa526cb9a28b1f4e4907665abf050c039
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
    R pkgs/development/libraries/fmod/4.24.16.nix
    R pkgs/development/libraries/fmod/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  fmod: remove


  Commit: 1cb3831f1c64ad9b64db1565572b9c737bae0707
      
https://github.com/NixOS/nixpkgs/commit/1cb3831f1c64ad9b64db1565572b9c737bae0707
  Author: Nikolay Amiantov <[email protected]>
  Date:   2016-12-18 (Sun, 18 Dec 2016)

  Changed paths:
    R pkgs/development/libraries/fmod/4.24.16.nix
    R pkgs/development/libraries/fmod/default.nix
    M pkgs/games/gzdoom/default.nix
    M pkgs/games/zandronum/default.nix
    A pkgs/games/zandronum/fmod.nix
    M pkgs/games/zdoom/default.nix
    M pkgs/tools/archivers/p7zip/default.nix
    A pkgs/tools/archivers/p7zip/setup-hook.sh
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #21231 from abbradar/no-fmod

Update DOOM forks, remove top-level fmod


Compare: https://github.com/NixOS/nixpkgs/compare/2fb80e573f27...1cb3831f1c64
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to