Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 0c1ea65be99b0de45200c5f6002ba19a7795c8ef
https://github.com/NixOS/nixpkgs/commit/0c1ea65be99b0de45200c5f6002ba19a7795c8ef
Author: Aycan iRiCAN <[email protected]>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M pkgs/development/libraries/haskell/pipes-aeson/default.nix
Log Message:
-----------
jailbreak pipes-aeson which depends on pipes-bytestring == 2.0.* which is not
available.
Commit: 86784cb7313d90fc86b38ce38cae8c0f369be038
https://github.com/NixOS/nixpkgs/commit/86784cb7313d90fc86b38ce38cae8c0f369be038
Author: Aycan iRiCAN <[email protected]>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M pkgs/development/libraries/haskell/pipes-binary/default.nix
Log Message:
-----------
jailbreak pipes-aeson which depends on pipes-bytestring == 2.0.* which is not
available
Commit: 5804f81eb347c691f5b629eb69270607fed9470b
https://github.com/NixOS/nixpkgs/commit/5804f81eb347c691f5b629eb69270607fed9470b
Author: Aycan iRiCAN <[email protected]>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M pkgs/tools/security/gnupg/default.nix
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 0acf2f98b744f2e5d105cd62d6996fc3fff048cd
https://github.com/NixOS/nixpkgs/commit/0acf2f98b744f2e5d105cd62d6996fc3fff048cd
Author: Aycan iRiCAN <[email protected]>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M lib/modules.nix
M nixos/modules/services/networking/ssh/sshd.nix
M pkgs/applications/networking/instant-messengers/skype/default.nix
M pkgs/applications/version-management/git-and-tools/git/default.nix
M pkgs/development/libraries/haskell/bson/default.nix
M pkgs/development/libraries/haskell/extensible-effects/default.nix
A pkgs/development/libraries/haskell/folds/default.nix
M pkgs/development/libraries/haskell/hcltest/default.nix
M pkgs/development/libraries/haskell/mongoDB/default.nix
M pkgs/development/libraries/haskell/pipes-bytestring/default.nix
M pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
M pkgs/development/libraries/haskell/simple-sendfile/default.nix
M pkgs/development/libraries/haskell/unix-compat/default.nix
M pkgs/os-specific/linux/kernel/linux-3.12.nix
R pkgs/os-specific/linux/kernel/linux-3.13.nix
M pkgs/servers/samba/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/haskell-packages.nix
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 3377abee50148b19568320fbb2b99a79f1f52a0c
https://github.com/NixOS/nixpkgs/commit/3377abee50148b19568320fbb2b99a79f1f52a0c
Author: Aycan iRiCAN <[email protected]>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M lib/licenses.nix
M nixos/lib/test-driver/log2html.xsl
M nixos/modules/services/networking/ssh/sshd.nix
M nixos/tests/openssh.nix
A pkgs/applications/audio/transcode/default.nix
A pkgs/applications/science/logic/twelf/default.nix
M pkgs/build-support/upstream-updater/update-walker-service-specific.sh
A pkgs/development/compilers/smlnj/bootstrap.nix
M pkgs/development/interpreters/php/5.4.nix
M pkgs/development/libraries/haskell/ghc-mod/default.nix
A pkgs/development/libraries/haskell/monadloc-pp/default.nix
A pkgs/development/libraries/libatomic_ops/default.nix
A pkgs/development/libraries/libatomic_ops/default.upstream
A pkgs/development/libraries/libe-book/0.0.nix
A pkgs/development/libraries/libe-book/0.0.upstream
A pkgs/development/libraries/libe-book/default.nix
A pkgs/development/libraries/libe-book/default.upstream
A pkgs/development/libraries/libmwaw/0.2.nix
A pkgs/development/libraries/libmwaw/0.2.upstream
A pkgs/development/libraries/libmwaw/default.nix
A pkgs/development/libraries/libmwaw/default.upstream
A pkgs/development/libraries/libodfgen/default.nix
A pkgs/development/libraries/libodfgen/default.upstream
A pkgs/development/libraries/librevenge/default.nix
A pkgs/development/libraries/librevenge/default.upstream
M pkgs/development/tools/misc/arcanist/default.nix
M pkgs/os-specific/linux/kernel/linux-3.10.nix
M pkgs/os-specific/linux/kernel/linux-3.14.nix
M pkgs/os-specific/linux/kernel/linux-3.15.nix
M pkgs/os-specific/linux/kernel/linux-3.4.nix
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/tools/graphics/povray/default.nix
M pkgs/tools/networking/network-manager-applet/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/haskell-packages.nix
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 83e224cacb874f7cf7606a628ab0aaaa29643a99
https://github.com/NixOS/nixpkgs/commit/83e224cacb874f7cf7606a628ab0aaaa29643a99
Author: Aycan iRiCAN <[email protected]>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Changed paths:
M nixos/lib/testing.nix
M nixos/tests/avahi.nix
M nixos/tests/bittorrent.nix
M nixos/tests/check-filesystems.nix
M nixos/tests/containers.nix
M nixos/tests/firefox.nix
M nixos/tests/firewall.nix
M nixos/tests/gnome3.nix
M nixos/tests/gnome3_12.nix
M nixos/tests/influxdb.nix
M nixos/tests/installer.nix
M nixos/tests/ipv6.nix
M nixos/tests/jenkins.nix
M nixos/tests/kde4.nix
M nixos/tests/kexec.nix
M nixos/tests/login.nix
M nixos/tests/logstash.nix
M nixos/tests/misc.nix
M nixos/tests/mpich.nix
M nixos/tests/mumble.nix
M nixos/tests/munin.nix
M nixos/tests/mysql-replication.nix
M nixos/tests/mysql.nix
M nixos/tests/nat.nix
M nixos/tests/nfs.nix
M nixos/tests/openssh.nix
M nixos/tests/partition.nix
M nixos/tests/phabricator.nix
M nixos/tests/printing.nix
M nixos/tests/proxy.nix
M nixos/tests/quake3.nix
M nixos/tests/rabbitmq.nix
M nixos/tests/simple.nix
M nixos/tests/subversion.nix
M nixos/tests/tomcat.nix
M nixos/tests/trac.nix
M nixos/tests/udisks2.nix
M nixos/tests/xfce.nix
M pkgs/applications/version-management/git-and-tools/default.nix
A
pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
M pkgs/development/libraries/gperftools/default.nix
A pkgs/development/libraries/nix-plugins/default.nix
M pkgs/tools/package-management/nix/unstable.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 2af20dbacff1d2fe5e7fee901d8428d91773b832
https://github.com/NixOS/nixpkgs/commit/2af20dbacff1d2fe5e7fee901d8428d91773b832
Author: Peter Simons <[email protected]>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M pkgs/development/libraries/haskell/pipes-aeson/default.nix
M pkgs/development/libraries/haskell/pipes-binary/default.nix
Log Message:
-----------
Merge pull request #3088 from aycanirican/master
jailbreak pipes-aeson which depends on pipes-bytestring == 2.0.* which i...
Compare: https://github.com/NixOS/nixpkgs/compare/7caec7414294...2af20dbacff1_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
