Branch: refs/heads/release-15.09
Home: https://github.com/NixOS/nixpkgs
Commit: 1bcda85e8d127cd0f9bff4e2ee85d9a439a0a3a3
https://github.com/NixOS/nixpkgs/commit/1bcda85e8d127cd0f9bff4e2ee85d9a439a0a3a3
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M pkgs/development/tools/misc/swig/2.x.nix
M pkgs/development/tools/misc/swig/3.x.nix
Log Message:
-----------
swig2: Enable on Darwin
(cherry picked from commit fbaaa9cccc868bd9cb33b97c08997ca37e9a66b8)
Conflicts:
pkgs/development/tools/misc/swig/3.x.nix
Commit: fae61545e621d0d40be14b4c555bec40794eadf1
https://github.com/NixOS/nixpkgs/commit/fae61545e621d0d40be14b4c555bec40794eadf1
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M pkgs/applications/misc/hello/ex-2/default.nix
M pkgs/build-support/setup-hooks/separate-debug-info.sh
M pkgs/stdenv/generic/default.nix
M pkgs/tools/package-management/nix/default.nix
Log Message:
-----------
separateDebugInfo: Assert Linux
Also remove some unintended setting of separateDebugInfo.
(cherry picked from commit 2a28bc669124190e28f7d62663eee9ce31759bc8)
Commit: 9a6c99b95e8d4a953b1f28743e4583aec0b81f94
https://github.com/NixOS/nixpkgs/commit/9a6c99b95e8d4a953b1f28743e4583aec0b81f94
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M doc/meta.xml
M doc/quick-start.xml
A pkgs/applications/misc/hello/default.nix
R pkgs/applications/misc/hello/ex-2/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
hello/ex-2 -> hello
(cherry picked from commit 645441c2075e9e449996e7368a918477c6da414e)
Compare: https://github.com/NixOS/nixpkgs/compare/52a88113a71c...9a6c99b95e8d_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
