Branch: refs/heads/x-updates
Home: https://github.com/NixOS/nixpkgs
Commit: fd896d09fa385481ee08cb5cf171890f624a548e
https://github.com/NixOS/nixpkgs/commit/fd896d09fa385481ee08cb5cf171890f624a548e
Author: Ricardo M. Correia <[email protected]>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M pkgs/top-level/all-packages.nix
Log Message:
-----------
grsecurity: Fix build under new generic kernel derivation
Commit: aeda8d63b92dd5059f32b3b79567e714211f1c65
https://github.com/NixOS/nixpkgs/commit/aeda8d63b92dd5059f32b3b79567e714211f1c65
Author: Ricardo M. Correia <[email protected]>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
grsecurity: Update stable and test patches
stable: 3.0-3.2.53-201312021727 -> 3.0-3.2.54-201401191012
test: 3.0-3.12.2-201312021733 -> 3.0-3.12.8-201401191015
Commit: 39a31190f06b6973d9493f125c9c858a453a86b2
https://github.com/NixOS/nixpkgs/commit/39a31190f06b6973d9493f125c9c858a453a86b2
Author: Eelco Dolstra <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/tools/misc/less/default.nix
Log Message:
-----------
less: Build on Darwin
Commit: 5150dbfdbe4144770d1dae868172fb94d7e6be55
https://github.com/NixOS/nixpkgs/commit/5150dbfdbe4144770d1dae868172fb94d7e6be55
Author: Eelco Dolstra <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/compilers/openjdk-darwin/default.nix
Log Message:
-----------
openjdk-darwin: Behave the same as openjdk-linux
Commit: e5995e0703de588af9d71e636eea7ddb1c695af0
https://github.com/NixOS/nixpkgs/commit/e5995e0703de588af9d71e636eea7ddb1c695af0
Author: Eelco Dolstra <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
A pkgs/development/libraries/java/junixsocket/darwin.patch
M pkgs/development/libraries/java/junixsocket/default.nix
Log Message:
-----------
junixsocket: Support Darwin
Patch borrowed from Rob Vermaas.
Commit: 197de444dfaad1137b45b7ad61cd36e16a5c0852
https://github.com/NixOS/nixpkgs/commit/197de444dfaad1137b45b7ad61cd36e16a5c0852
Author: Cillian de Róiste <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/top-level/python-packages.nix
Log Message:
-----------
ipython: disable support for qtconsole, pylabQt and pylab on Darwin
Qt and CUPS are not supported on Darwin and are dependencies.
Note: this makes ipython the same as ipythonLight on Darwin, but
ipython is used as an input for other packages (ipdb and ipdplugin)
and it is reasonable to assume that users on other platforms may
choose ipythonLight.
Commit: 9739171cd46735777137652db948ee76eabc5df6
https://github.com/NixOS/nixpkgs/commit/9739171cd46735777137652db948ee76eabc5df6
Author: Vladimír Čunát <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge pull request #1567 from wizeman/u/grsec-upd-and-fix
grsecurity: Fix build and update patches
Commit: bc5995e3924397683b12766653087ff4bfbafbd7
https://github.com/NixOS/nixpkgs/commit/bc5995e3924397683b12766653087ff4bfbafbd7
Author: Eelco Dolstra <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/tools/archivers/cpio/default.nix
Log Message:
-----------
cpio: Fix build on Darwin
Commit: 4350c64bba80a598c9a9ee242e8dd91dea34b1aa
https://github.com/NixOS/nixpkgs/commit/4350c64bba80a598c9a9ee242e8dd91dea34b1aa
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/GlomeVec/default.nix
Log Message:
-----------
haskell-GlomeVec: update to version 0.2
Commit: 8c58f6904a01e67fa0d08346a810f236f9013f17
https://github.com/NixOS/nixpkgs/commit/8c58f6904a01e67fa0d08346a810f236f9013f17
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/JuicyPixels/default.nix
Log Message:
-----------
haskell-JuicyPixels: update to version 3.1.3.2
Commit: 728c16612310e42d878af5bb44a31f98d02f85d6
https://github.com/NixOS/nixpkgs/commit/728c16612310e42d878af5bb44a31f98d02f85d6
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/diagrams/cairo.nix
Log Message:
-----------
haskell-diagrams-cairo: update to version 1.0.1
Commit: b1e174725b72738412e70dbce5ee41da08402735
https://github.com/NixOS/nixpkgs/commit/b1e174725b72738412e70dbce5ee41da08402735
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/diagrams/lib.nix
Log Message:
-----------
haskell-diagrams-lib: update to version 1.0.1
Commit: 2cd347770ca547ed1ed8f7a3353383863c3e1852
https://github.com/NixOS/nixpkgs/commit/2cd347770ca547ed1ed8f7a3353383863c3e1852
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/diagrams/svg.nix
Log Message:
-----------
haskell-diagrams-svg: update to version 1.0.1
Commit: f1530932bf282362912069f88023774e083b5ded
https://github.com/NixOS/nixpkgs/commit/f1530932bf282362912069f88023774e083b5ded
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/esqueleto/default.nix
Log Message:
-----------
haskell-esqueleto: update to version 1.3.4.5
Commit: 9c358f40232493d02001df1a73fc2ce012182411
https://github.com/NixOS/nixpkgs/commit/9c358f40232493d02001df1a73fc2ce012182411
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/hit/default.nix
Log Message:
-----------
haskell-hit: update to version 0.5.3
Commit: e3f528ad8a44b2e0ed439a5be303446682dff6ae
https://github.com/NixOS/nixpkgs/commit/e3f528ad8a44b2e0ed439a5be303446682dff6ae
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/http-client/default.nix
Log Message:
-----------
haskell-http-client: update to version 0.2.1.1
Commit: ea8c3ee7a2227fdbeebfdf5b9c9d7adffaac6c38
https://github.com/NixOS/nixpkgs/commit/ea8c3ee7a2227fdbeebfdf5b9c9d7adffaac6c38
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/http-conduit/default.nix
Log Message:
-----------
haskell-http-conduit: update to version 2.0.0.4
Commit: 838e8d3426fbf2017c18fa77e6d5eabaf566075c
https://github.com/NixOS/nixpkgs/commit/838e8d3426fbf2017c18fa77e6d5eabaf566075c
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/network-conduit/default.nix
Log Message:
-----------
haskell-network-conduit: update to version 1.0.2
Commit: 221eafa7aac00ea99b16d00b7ed52e6a5d43cc7e
https://github.com/NixOS/nixpkgs/commit/221eafa7aac00ea99b16d00b7ed52e6a5d43cc7e
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/stm-conduit/default.nix
Log Message:
-----------
haskell-stm-conduit: update to version 2.2.1.1
Commit: 2c23e7227d19be79c0ee8c1293d37c301088a2c9
https://github.com/NixOS/nixpkgs/commit/2c23e7227d19be79c0ee8c1293d37c301088a2c9
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/wai-extra/default.nix
Log Message:
-----------
haskell-wai-extra: update to version 2.0.3.2
Commit: dc354b0beb6d3fd6432fa918655b1e29bc0db88c
https://github.com/NixOS/nixpkgs/commit/dc354b0beb6d3fd6432fa918655b1e29bc0db88c
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/tools/haskell/HaRe/default.nix
Log Message:
-----------
haskell-HaRe: update to version 0.7.1.0
Commit: cae97e9418908c374d41939456da7a55c3275518
https://github.com/NixOS/nixpkgs/commit/cae97e9418908c374d41939456da7a55c3275518
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
A pkgs/development/libraries/haskell/asn1-encoding/default.nix
A pkgs/development/libraries/haskell/asn1-parse/default.nix
A pkgs/development/libraries/haskell/x509-store/default.nix
A pkgs/development/libraries/haskell/x509-system/default.nix
A pkgs/development/libraries/haskell/x509-validation/default.nix
A pkgs/development/libraries/haskell/x509/default.nix
M pkgs/top-level/haskell-packages.nix
Log Message:
-----------
Add newly required Haskell packages.
- asn1-encoding: add version 0.8.1.2
- asn1-parse: add version 0.8.1
- x509-store: add version 1.4.3
- x509-system: add version 1.4.2
- x509-validation: add version 1.5.0
- x509: add version 1.4.7
Commit: c13d4085a3a78bc2a0b33248a4293c3521be7f23
https://github.com/NixOS/nixpkgs/commit/c13d4085a3a78bc2a0b33248a4293c3521be7f23
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/network-conduit/default.nix
Log Message:
-----------
haskell-network-conduit: disable test suite to fix build errors with GHC 7.4.2
https://github.com/snoyberg/conduit/issues/134
Commit: b8d6e1d4586d1c43f0db0b9f02ed6feedea5486d
https://github.com/NixOS/nixpkgs/commit/b8d6e1d4586d1c43f0db0b9f02ed6feedea5486d
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/diagrams/svg.nix
Log Message:
-----------
haskell-diagrams-svg: jailbreak to fix build with recent blaze-markup
Commit: 63ec2bec8f3791370032ca821a4292c6ffc79f1a
https://github.com/NixOS/nixpkgs/commit/63ec2bec8f3791370032ca821a4292c6ffc79f1a
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Log Message:
-----------
haskell-git-annex: update to version 5.20140127
Commit: 4cbf42f006eb9a7ccfe31cf906070b9753509f8b
https://github.com/NixOS/nixpkgs/commit/4cbf42f006eb9a7ccfe31cf906070b9753509f8b
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/direct-sqlite/default.nix
Log Message:
-----------
haskell-direct-sqlite: update to version 2.3.11
Commit: 55a8134bbec4f8fdd15da3b71946aad78512f0c0
https://github.com/NixOS/nixpkgs/commit/55a8134bbec4f8fdd15da3b71946aad78512f0c0
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/highlighting-kate/default.nix
Log Message:
-----------
haskell-highlighting-kate: update to version 0.5.6.1
Commit: 048029493750a9f8d253054f10fe6158f59835b3
https://github.com/NixOS/nixpkgs/commit/048029493750a9f8d253054f10fe6158f59835b3
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/network-conduit/default.nix
Log Message:
-----------
haskell-network-conduit: update to version 1.0.2.1
Commit: 9e36e4be1837ed2f87341fb4b7f616712e217409
https://github.com/NixOS/nixpkgs/commit/9e36e4be1837ed2f87341fb4b7f616712e217409
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/yaml/default.nix
Log Message:
-----------
haskell-yaml: update to version 0.8.5.4
Commit: 069220a868a3ac3f1ce60cd30e73088de5b61dde
https://github.com/NixOS/nixpkgs/commit/069220a868a3ac3f1ce60cd30e73088de5b61dde
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/haskell/yesod-bin/default.nix
Log Message:
-----------
haskell-yesod-bin: update to version 1.2.5.7
Commit: 134d52cb5fb2328add74107acf93d2c616abdbcd
https://github.com/NixOS/nixpkgs/commit/134d52cb5fb2328add74107acf93d2c616abdbcd
Author: Peter Simons <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/tools/haskell/HaRe/default.nix
Log Message:
-----------
haskell-HaRe: update to version 0.7.1.1
Commit: a8a5a5905904b1319af5a0e1cfe03e577333013e
https://github.com/NixOS/nixpkgs/commit/a8a5a5905904b1319af5a0e1cfe03e577333013e
Author: Eelco Dolstra <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/stdenv/linux/default.nix
Log Message:
-----------
stdenv-linux: Fix binutils override
This ensures that pkgs.binutils equals the binutils used in the final
stdenv, as intended.
Commit: 577c20c23b8590fcbb527f7831f8def0c52c479e
https://github.com/NixOS/nixpkgs/commit/577c20c23b8590fcbb527f7831f8def0c52c479e
Author: Marc Weber <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/development/libraries/fltk/fltk13.nix
Log Message:
-----------
tigervnc: fix ctrl-* keys, eg ctrl-c ctrl-v ctrl-d by applying patch to fltk
I'm unsure about
- is it ok to apply this patch globally, or should it be overridden for
tigervnc only?
- how many rebuilds it triggers
- whether it was neccessary to update to latest dev version (seems to work)
The bug report indicates that others distros just includes this patch (?)
Cf. #1498. vcunat: the patch should be usable globally, as e.g. Arch does it.
Using autoreconfHook doesn't work for me, maybe --force is bad for it.
Commit: 1a68ee7deb2d9dbc6b6d18d5bd49677a6328b89d
https://github.com/NixOS/nixpkgs/commit/1a68ee7deb2d9dbc6b6d18d5bd49677a6328b89d
Author: Eelco Dolstra <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/top-level/release.nix
Log Message:
-----------
Disable FreeBSD builds
Commit: 6f5be260b47c65dfc517ecbdb6bbc0a6826135fa
https://github.com/NixOS/nixpkgs/commit/6f5be260b47c65dfc517ecbdb6bbc0a6826135fa
Author: Petr Rockai <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
M pkgs/applications/graphics/photivo/default.nix
M pkgs/applications/networking/browsers/w3m/default.nix
M pkgs/development/tools/build-managers/cmake/default.nix
M pkgs/development/tools/misc/lsof/default.nix
M pkgs/games/stepmania/default.nix
M pkgs/os-specific/linux/pam_krb5/default.nix
M pkgs/servers/dict/default.nix
Log Message:
-----------
Adopt packages.
Commit: 908ce109f9e1f2ffef616a4e2a85b13054f459cf
https://github.com/NixOS/nixpkgs/commit/908ce109f9e1f2ffef616a4e2a85b13054f459cf
Author: Vladimír Čunát <[email protected]>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
M pkgs/applications/graphics/photivo/default.nix
M pkgs/applications/networking/browsers/w3m/default.nix
M pkgs/applications/version-management/git-and-tools/git-annex/default.nix
M pkgs/development/compilers/openjdk-darwin/default.nix
M pkgs/development/libraries/fltk/fltk13.nix
M pkgs/development/libraries/haskell/GlomeVec/default.nix
M pkgs/development/libraries/haskell/JuicyPixels/default.nix
A pkgs/development/libraries/haskell/asn1-encoding/default.nix
A pkgs/development/libraries/haskell/asn1-parse/default.nix
M pkgs/development/libraries/haskell/diagrams/cairo.nix
M pkgs/development/libraries/haskell/diagrams/lib.nix
M pkgs/development/libraries/haskell/diagrams/svg.nix
M pkgs/development/libraries/haskell/direct-sqlite/default.nix
M pkgs/development/libraries/haskell/esqueleto/default.nix
M pkgs/development/libraries/haskell/highlighting-kate/default.nix
M pkgs/development/libraries/haskell/hit/default.nix
M pkgs/development/libraries/haskell/http-client/default.nix
M pkgs/development/libraries/haskell/http-conduit/default.nix
M pkgs/development/libraries/haskell/network-conduit/default.nix
M pkgs/development/libraries/haskell/stm-conduit/default.nix
M pkgs/development/libraries/haskell/wai-extra/default.nix
A pkgs/development/libraries/haskell/x509-store/default.nix
A pkgs/development/libraries/haskell/x509-system/default.nix
A pkgs/development/libraries/haskell/x509-validation/default.nix
A pkgs/development/libraries/haskell/x509/default.nix
M pkgs/development/libraries/haskell/yaml/default.nix
M pkgs/development/libraries/haskell/yesod-bin/default.nix
A pkgs/development/libraries/java/junixsocket/darwin.patch
M pkgs/development/libraries/java/junixsocket/default.nix
M pkgs/development/tools/build-managers/cmake/default.nix
M pkgs/development/tools/haskell/HaRe/default.nix
M pkgs/development/tools/misc/lsof/default.nix
M pkgs/games/stepmania/default.nix
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/os-specific/linux/pam_krb5/default.nix
M pkgs/servers/dict/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/tools/archivers/cpio/default.nix
M pkgs/tools/misc/less/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/haskell-packages.nix
M pkgs/top-level/python-packages.nix
M pkgs/top-level/release.nix
Log Message:
-----------
Merge master into x-updates (the binutils change)
Compare: https://github.com/NixOS/nixpkgs/compare/120be164794e...908ce109f9e1_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
