Branch: refs/heads/staging
Home: https://github.com/NixOS/nixpkgs
Commit: 70ed0fd3dec4f3fb074f995cb7d495406162216d
https://github.com/NixOS/nixpkgs/commit/70ed0fd3dec4f3fb074f995cb7d495406162216d
Author: Profpatsch <[email protected]>
Date: 2016-08-26 (Fri, 26 Aug 2016)
Changed paths:
M pkgs/development/haskell-modules/configuration-common.nix
A pkgs/development/haskell-modules/patches/spy.patch
Log Message:
-----------
haskellPackages.spy: fix for new fsnotify version
Temporary fix, until it is merged upstream.
Commit: f688ea37d8ee41e42903f4eef7b6537dea14dfa8
https://github.com/NixOS/nixpkgs/commit/f688ea37d8ee41e42903f4eef7b6537dea14dfa8
Author: Vladimír Čunát <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
A pkgs/development/tools/build-managers/bear/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
bear: init at 2.2.0
Commit: b981fe2095e5975bc976f489d1d245e3280a7969
https://github.com/NixOS/nixpkgs/commit/b981fe2095e5975bc976f489d1d245e3280a7969
Author: Vladimír Čunát <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
M pkgs/misc/vim-plugins/default.nix
M pkgs/misc/vim-plugins/vim-plugin-names
Log Message:
-----------
vim-indent-guides: init at 2016-04-17
Commit: 005a147f925d782271cd828e3a108471dbf9bfa0
https://github.com/NixOS/nixpkgs/commit/005a147f925d782271cd828e3a108471dbf9bfa0
Author: Robin Gloster <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
M pkgs/applications/science/math/sage/default.nix
Log Message:
-----------
sage: fix build
closes #17842
Commit: 6f21201f930775f8d5fc2b06012b600b451e4b5a
https://github.com/NixOS/nixpkgs/commit/6f21201f930775f8d5fc2b06012b600b451e4b5a
Author: Robin Gloster <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
M pkgs/development/tools/rtags/default.nix
Log Message:
-----------
rtags: git-2016-04-29 -> 2.3
should fix the darwin build
Commit: 17af87323dbe6d28e48b24a31a29c21088d5f75f
https://github.com/NixOS/nixpkgs/commit/17af87323dbe6d28e48b24a31a29c21088d5f75f
Author: Vincent Laporte <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
M pkgs/applications/science/math/maxima/default.nix
Log Message:
-----------
maxima: 5.36.1 -> 5.38.1
Commit: 9ddcd5d4568ce7201b35973632684c98d06aa362
https://github.com/NixOS/nixpkgs/commit/9ddcd5d4568ce7201b35973632684c98d06aa362
Author: YPares <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
M pkgs/development/haskell-modules/generic-stack-builder.nix
Log Message:
-----------
Haskell stack nix shell: using lib.getLib/Dev now
Commit: 8eaa645eca032f806d7ee4c3611d2d3a4ab7c303
https://github.com/NixOS/nixpkgs/commit/8eaa645eca032f806d7ee4c3611d2d3a4ab7c303
Author: Peter Simons <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
M pkgs/applications/science/math/maxima/default.nix
Log Message:
-----------
Merge pull request #18086 from vbgl/maxima-5.38.1
maxima: 5.36.1 -> 5.38.1
Commit: 486c2048590899403b4cd3089f11056268c814f4
https://github.com/NixOS/nixpkgs/commit/486c2048590899403b4cd3089f11056268c814f4
Author: Peter Simons <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
M pkgs/development/haskell-modules/generic-stack-builder.nix
Log Message:
-----------
Merge pull request #18087 from YPares/stack-getlib
Haskell stack nix shell: using lib.getLib/Dev now
Commit: 67c57a9ce53f1f488ab0fc355a4452feeb9c5a67
https://github.com/NixOS/nixpkgs/commit/67c57a9ce53f1f488ab0fc355a4452feeb9c5a67
Author: Peter Simons <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
M pkgs/development/haskell-modules/configuration-common.nix
A pkgs/development/haskell-modules/patches/spy.patch
Log Message:
-----------
Merge pull request #18016 from Profpatsch/spy-patch
haskellPackages.spy: fix for new fsnotify version
Commit: 1ba32c54036cf6552d5f4aaf3d34ccaaa006dbe0
https://github.com/NixOS/nixpkgs/commit/1ba32c54036cf6552d5f4aaf3d34ccaaa006dbe0
Author: obadz <[email protected]>
Date: 2016-08-29 (Mon, 29 Aug 2016)
Changed paths:
M pkgs/applications/science/math/maxima/default.nix
M pkgs/applications/science/math/sage/default.nix
M pkgs/development/haskell-modules/configuration-common.nix
M pkgs/development/haskell-modules/generic-stack-builder.nix
A pkgs/development/haskell-modules/patches/spy.patch
A pkgs/development/tools/build-managers/bear/default.nix
M pkgs/development/tools/rtags/default.nix
M pkgs/misc/vim-plugins/default.nix
M pkgs/misc/vim-plugins/vim-plugin-names
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge branch 'master' into staging
Compare: https://github.com/NixOS/nixpkgs/compare/6389f9b34964...1ba32c54036c_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits