Branch: refs/heads/staging
Home: https://github.com/NixOS/nixpkgs
Commit: e08b9ab8d3d6362c774a786797347fa7483af773
https://github.com/NixOS/nixpkgs/commit/e08b9ab8d3d6362c774a786797347fa7483af773
Author: Eric Seidel <[email protected]>
Date: 2015-02-07 (Sat, 07 Feb 2015)
Changed paths:
M pkgs/applications/audio/ncmpcpp/default.nix
M pkgs/applications/misc/gammu/default.nix
M pkgs/applications/networking/feedreaders/newsbeuter/default.nix
M pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
M pkgs/applications/networking/p2p/twister/default.nix
M pkgs/applications/science/astronomy/stellarium/default.nix
M pkgs/applications/search/recoll/default.nix
M pkgs/applications/version-management/redmine/default.nix
M pkgs/applications/video/aegisub/default.nix
M pkgs/development/compilers/vala/0.26.nix
M pkgs/development/compilers/vala/default.nix
M pkgs/development/interpreters/ruby/patches.nix
M pkgs/development/libraries/apr-util/default.nix
M pkgs/development/libraries/avahi/default.nix
M pkgs/development/libraries/cairo/default.nix
M pkgs/development/libraries/dbus-glib/default.nix
M pkgs/development/libraries/glib/default.nix
M pkgs/development/libraries/libgsf/default.nix
M pkgs/development/libraries/libtorrent-rasterbar/generic.nix
M pkgs/development/libraries/p11-kit/default.nix
M pkgs/development/libraries/poppler/default.nix
M pkgs/development/libraries/stfl/default.nix
M pkgs/development/ocaml-modules/ocaml-text/default.nix
M pkgs/development/tools/vagrant/default.nix
M pkgs/misc/ghostscript/default.nix
M pkgs/servers/irc/ngircd/default.nix
M pkgs/tools/filesystems/netatalk/default.nix
M pkgs/tools/misc/aescrypt/default.nix
M pkgs/tools/misc/mdbtools/git.nix
M pkgs/tools/package-management/disnix/default.nix
M pkgs/tools/security/clamav/default.nix
M pkgs/tools/security/gnupg/20.nix
M pkgs/tools/security/opensc/default.nix
M pkgs/tools/text/enca/default.nix
M pkgs/tools/text/gnugrep/default.nix
M pkgs/tools/typesetting/docbook2x/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
kill libiconvOr*
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
Commit: 472feaf53becef9cc0551babc44a1f5db3beed51
https://github.com/NixOS/nixpkgs/commit/472feaf53becef9cc0551babc44a1f5db3beed51
Author: Eric Seidel <[email protected]>
Date: 2015-02-07 (Sat, 07 Feb 2015)
Changed paths:
M pkgs/tools/text/gnugrep/default.nix
Log Message:
-----------
dont need -liconv
Commit: 7bea6aafae10731b53e2f8b9a66d6488a3a9f54a
https://github.com/NixOS/nixpkgs/commit/7bea6aafae10731b53e2f8b9a66d6488a3a9f54a
Author: Dan Peebles <[email protected]>
Date: 2015-02-08 (Sun, 08 Feb 2015)
Changed paths:
M pkgs/build-support/cc-wrapper/cc-wrapper.sh
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/build-support/cc-wrapper/setup-hook.sh
Log Message:
-----------
Some cc-wrapper changes to better support darwin and clang:
- Add a conditional flag for the c++ std lib
- Build binaries that get linked by our own dyld (someday)
- Automatically add framework directories in the setup hook
Commit: 127efcd6f6bf5870b43efe588e37c28994ea94fa
https://github.com/NixOS/nixpkgs/commit/127efcd6f6bf5870b43efe588e37c28994ea94fa
Author: Shea Levy <[email protected]>
Date: 2015-02-11 (Wed, 11 Feb 2015)
Changed paths:
M pkgs/applications/audio/ncmpcpp/default.nix
M pkgs/applications/misc/gammu/default.nix
M pkgs/applications/networking/feedreaders/newsbeuter/default.nix
M pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
M pkgs/applications/networking/p2p/twister/default.nix
M pkgs/applications/science/astronomy/stellarium/default.nix
M pkgs/applications/search/recoll/default.nix
M pkgs/applications/version-management/redmine/default.nix
M pkgs/applications/video/aegisub/default.nix
M pkgs/development/compilers/vala/0.26.nix
M pkgs/development/compilers/vala/default.nix
M pkgs/development/interpreters/ruby/patches.nix
M pkgs/development/libraries/apr-util/default.nix
M pkgs/development/libraries/avahi/default.nix
M pkgs/development/libraries/cairo/default.nix
M pkgs/development/libraries/dbus-glib/default.nix
M pkgs/development/libraries/glib/default.nix
M pkgs/development/libraries/libgsf/default.nix
M pkgs/development/libraries/libtorrent-rasterbar/generic.nix
M pkgs/development/libraries/p11-kit/default.nix
M pkgs/development/libraries/poppler/default.nix
M pkgs/development/libraries/stfl/default.nix
M pkgs/development/ocaml-modules/ocaml-text/default.nix
M pkgs/development/tools/vagrant/default.nix
M pkgs/misc/ghostscript/default.nix
M pkgs/servers/irc/ngircd/default.nix
M pkgs/tools/filesystems/netatalk/default.nix
M pkgs/tools/misc/aescrypt/default.nix
M pkgs/tools/misc/mdbtools/git.nix
M pkgs/tools/package-management/disnix/default.nix
M pkgs/tools/security/clamav/default.nix
M pkgs/tools/security/gnupg/20.nix
M pkgs/tools/security/opensc/default.nix
M pkgs/tools/text/enca/default.nix
M pkgs/tools/text/gnugrep/default.nix
M pkgs/tools/typesetting/docbook2x/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into
staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv
Conflicts:
pkgs/applications/audio/ncmpcpp/default.nix
Commit: 7a1d132db9508d9831766da5b012d3d55e8c37c1
https://github.com/NixOS/nixpkgs/commit/7a1d132db9508d9831766da5b012d3d55e8c37c1
Author: Shea Levy <[email protected]>
Date: 2015-02-11 (Wed, 11 Feb 2015)
Changed paths:
M pkgs/build-support/cc-wrapper/cc-wrapper.sh
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/build-support/cc-wrapper/setup-hook.sh
Log Message:
-----------
Merge branch 'cc-wrapper-improvements' of git://github.com/copumpkin/nixpkgs
into staging
Compare: https://github.com/NixOS/nixpkgs/compare/db4cb021c024...7a1d132db950_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
