Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 6617c8bd87e185ece1762c22ed4521adebd7c65b
https://github.com/NixOS/nixpkgs/commit/6617c8bd87e185ece1762c22ed4521adebd7c65b
Author: Vladimír Čunát <vcu...@gmail.com>
Date: 2017-04-14 (Fri, 14 Apr 2017)
Changed paths:
M lib/default.nix
M lib/tests.nix
M lib/trivial.nix
M maintainers/scripts/all-tarballs.nix
M nixos/doc/manual/release-notes/rl-1709.xml
M nixos/modules/security/acme.nix
M nixos/modules/services/web-servers/lighttpd/gitweb.nix
M nixos/modules/system/boot/systemd-lib.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
R pkgs/applications/editors/idea/common.nix
R pkgs/applications/editors/idea/default.nix
A pkgs/applications/editors/jetbrains/common.nix
A pkgs/applications/editors/jetbrains/default.nix
M pkgs/applications/editors/nano/default.nix
A pkgs/applications/misc/gpsbabel/clang-4.patch
M pkgs/applications/misc/gpsbabel/default.nix
M pkgs/applications/networking/browsers/firefox-bin/default.nix
M pkgs/applications/networking/cluster/terragrunt/default.nix
M pkgs/applications/networking/cluster/terragrunt/deps.nix
M pkgs/applications/video/kodi/default.nix
M pkgs/applications/window-managers/trayer/default.nix
M pkgs/build-support/build-fhs-userenv/env.nix
M pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
M pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
M pkgs/development/libraries/gtk-mac-integration/default.nix
M pkgs/development/libraries/libressl/2.5.nix
M pkgs/development/libraries/opal/default.nix
M pkgs/development/libraries/science/math/suitesparse/4.2.nix
M pkgs/development/libraries/science/math/suitesparse/default.nix
M pkgs/development/libraries/webkitgtk/2.14.nix
A pkgs/development/libraries/webkitgtk/PR-152650-2.patch
A pkgs/development/libraries/webkitgtk/PR-153138.patch
A pkgs/development/libraries/webkitgtk/PR-157554.patch
A pkgs/development/libraries/webkitgtk/PR-157574.patch
A pkgs/development/python-modules/phonenumbers/default.nix
A pkgs/development/tools/compile-daemon/default.nix
A pkgs/development/tools/compile-daemon/deps.nix
M pkgs/development/tools/misc/hydra/default.nix
M pkgs/development/tools/pypi2nix/default.nix
M pkgs/development/tools/unity3d/default.nix
M pkgs/os-specific/linux/kernel/linux-4.10.nix
M pkgs/os-specific/linux/kernel/linux-4.4.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/patches.nix
M pkgs/servers/emby/default.nix
M pkgs/servers/http/nginx/mainline.nix
M pkgs/servers/matrix-synapse/default.nix
M pkgs/tools/package-management/nix/default.nix
M pkgs/top-level/aliases.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/release.nix
M pkgs/top-level/rust-packages.nix
Log Message:
-----------
A fixed version of commit eb750f9a7b2
For detailed explanation see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
Commit: 4aec96b379d3f1b89128297b0943253d6961cf94
https://github.com/NixOS/nixpkgs/commit/4aec96b379d3f1b89128297b0943253d6961cf94
Author: Vladimír Čunát <vcu...@gmail.com>
Date: 2017-04-14 (Fri, 14 Apr 2017)
Changed paths:
M lib/default.nix
M lib/tests.nix
M lib/trivial.nix
M maintainers/scripts/all-tarballs.nix
M nixos/doc/manual/release-notes/rl-1709.xml
M nixos/modules/security/acme.nix
M nixos/modules/services/web-servers/lighttpd/gitweb.nix
M nixos/modules/system/boot/systemd-lib.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
R pkgs/applications/editors/idea/common.nix
R pkgs/applications/editors/idea/default.nix
A pkgs/applications/editors/jetbrains/common.nix
A pkgs/applications/editors/jetbrains/default.nix
M pkgs/applications/editors/nano/default.nix
A pkgs/applications/misc/gpsbabel/clang-4.patch
M pkgs/applications/misc/gpsbabel/default.nix
M pkgs/applications/networking/browsers/firefox-bin/default.nix
M pkgs/applications/networking/cluster/terragrunt/default.nix
M pkgs/applications/networking/cluster/terragrunt/deps.nix
M pkgs/applications/video/kodi/default.nix
M pkgs/applications/window-managers/trayer/default.nix
M pkgs/build-support/build-fhs-userenv/env.nix
M pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
M pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
M pkgs/development/libraries/gtk-mac-integration/default.nix
M pkgs/development/libraries/libressl/2.5.nix
M pkgs/development/libraries/opal/default.nix
M pkgs/development/libraries/science/math/suitesparse/4.2.nix
M pkgs/development/libraries/science/math/suitesparse/default.nix
M pkgs/development/libraries/webkitgtk/2.14.nix
A pkgs/development/libraries/webkitgtk/PR-152650-2.patch
A pkgs/development/libraries/webkitgtk/PR-153138.patch
A pkgs/development/libraries/webkitgtk/PR-157554.patch
A pkgs/development/libraries/webkitgtk/PR-157574.patch
A pkgs/development/python-modules/phonenumbers/default.nix
A pkgs/development/tools/compile-daemon/default.nix
A pkgs/development/tools/compile-daemon/deps.nix
M pkgs/development/tools/misc/hydra/default.nix
M pkgs/development/tools/pypi2nix/default.nix
M pkgs/development/tools/unity3d/default.nix
M pkgs/os-specific/linux/kernel/linux-4.10.nix
M pkgs/os-specific/linux/kernel/linux-4.4.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/patches.nix
M pkgs/servers/emby/default.nix
M pkgs/servers/http/nginx/mainline.nix
M pkgs/servers/matrix-synapse/default.nix
R pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
M pkgs/tools/filesystems/bonnie/default.nix
M pkgs/tools/package-management/nix/default.nix
M pkgs/top-level/aliases.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/release.nix
M pkgs/top-level/rust-packages.nix
Log Message:
-----------
Merge the two "same" merges
This only takes the state from the second parent.
The purpose is that when this commit depends on the failed one,
simply merging this commit is a safe way to fix the problems. Details:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
Commit: 2090aa4f65e860567af03cb3b7aa042df7168ead
https://github.com/NixOS/nixpkgs/commit/2090aa4f65e860567af03cb3b7aa042df7168ead
Author: Vladimír Čunát <vcu...@gmail.com>
Date: 2017-04-14 (Fri, 14 Apr 2017)
Changed paths:
M lib/default.nix
M lib/tests.nix
M lib/trivial.nix
M nixos/doc/manual/release-notes/rl-1709.xml
M nixos/modules/security/acme.nix
M nixos/modules/services/web-servers/lighttpd/gitweb.nix
M nixos/modules/system/boot/systemd-lib.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
R pkgs/applications/editors/idea/common.nix
R pkgs/applications/editors/idea/default.nix
A pkgs/applications/editors/jetbrains/common.nix
A pkgs/applications/editors/jetbrains/default.nix
A pkgs/applications/misc/gpsbabel/clang-4.patch
M pkgs/applications/misc/gpsbabel/default.nix
M pkgs/applications/networking/browsers/firefox-bin/default.nix
M pkgs/applications/networking/cluster/terragrunt/default.nix
M pkgs/applications/networking/cluster/terragrunt/deps.nix
M pkgs/applications/video/kodi/default.nix
M pkgs/applications/window-managers/trayer/default.nix
M pkgs/build-support/build-fhs-userenv/env.nix
M pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
M pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
M pkgs/development/libraries/gtk-mac-integration/default.nix
M pkgs/development/libraries/libressl/2.5.nix
M pkgs/development/libraries/opal/default.nix
M pkgs/development/libraries/science/math/suitesparse/4.2.nix
M pkgs/development/libraries/science/math/suitesparse/default.nix
M pkgs/development/libraries/webkitgtk/2.14.nix
A pkgs/development/libraries/webkitgtk/PR-152650-2.patch
A pkgs/development/libraries/webkitgtk/PR-153138.patch
A pkgs/development/libraries/webkitgtk/PR-157554.patch
A pkgs/development/libraries/webkitgtk/PR-157574.patch
A pkgs/development/python-modules/phonenumbers/default.nix
A pkgs/development/tools/compile-daemon/default.nix
A pkgs/development/tools/compile-daemon/deps.nix
M pkgs/development/tools/misc/hydra/default.nix
M pkgs/development/tools/pypi2nix/default.nix
M pkgs/development/tools/unity3d/default.nix
M pkgs/os-specific/linux/kernel/linux-4.10.nix
M pkgs/os-specific/linux/kernel/linux-4.4.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/patches.nix
M pkgs/servers/emby/default.nix
M pkgs/servers/http/nginx/mainline.nix
M pkgs/servers/matrix-synapse/default.nix
R pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
M pkgs/tools/filesystems/bonnie/default.nix
M pkgs/tools/package-management/nix/default.nix
M pkgs/top-level/aliases.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/release.nix
M pkgs/top-level/rust-packages.nix
Log Message:
-----------
Merge: fixup a bad merge
For details see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
Compare: https://github.com/NixOS/nixpkgs/compare/eec35cb6bd82...2090aa4f65e8_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits
