Skip to content

vim_configurable (7.4): fix build on darwin#912

Closed
lovek323 wants to merge 2 commits intoNixOS:masterfrom
lovek323:vim74
Closed

vim_configurable (7.4): fix build on darwin#912
lovek323 wants to merge 2 commits intoNixOS:masterfrom
lovek323:vim74

Conversation

@lovek323
Copy link
Copy Markdown
Member

@lovek323 lovek323 commented Sep 4, 2013

No description provided.

@vcunat
Copy link
Copy Markdown
Member

vcunat commented Sep 6, 2013

This source is bad, it returns a different hash every time. We have patch 22 now, but I don't know about a patched source.

@vcunat
Copy link
Copy Markdown
Member

vcunat commented Sep 6, 2013

Hmm, perhaps the collapsed big patch from Gentoo is the easiest way http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.22.patch.bz2

Someone knows a better solution?

@lovek323
Copy link
Copy Markdown
Member Author

lovek323 commented Sep 6, 2013

I don't understand why this hash would be different every time. It's just a tag on the mercurial repository. I'll try it with the Gentoo source.

@lovek323
Copy link
Copy Markdown
Member Author

lovek323 commented Sep 8, 2013

@vcunat: I've changed it so that the patches are applied individually. This way, it will be very easy to add new patches in as they come.

@vcunat vcunat closed this in 2eb384b Sep 18, 2013
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Sep 18, 2013

I tested the build. Squashed and pushed.

MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…le' into experimental/multiple-versions-in-one-file

* commit 'refs/top-bases/experimental/multiple-versions-in-one-file': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* master: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/mingw': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/ati': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* master: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/xsbt': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…/inkscape

* commit 'refs/top-bases/experimental/inkscape': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…/gimp-git

* commit 'refs/top-bases/experimental/gimp-git': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...

Conflicts:
	pkgs/development/libraries/gobject-introspection/default.nix
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/nix': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…lover

* commit 'refs/top-bases/experimental/plover': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* master: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…rimental/imap-sync-update

* commit 'refs/top-bases/experimental/imap-sync-update': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…/overlays

* commit 'refs/top-bases/experimental/overlays': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…/updates

* experimental/overlays: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...

Conflicts:
	pkgs/development/libraries/gobject-introspection/default.nix
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…/hack-nix

* experimental/overlays: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…/hack-nix

* commit 'refs/top-bases/experimental/hack-nix': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…updates

* commit 'refs/top-bases/experimental/updates': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...

Conflicts:
	pkgs/applications/editors/vim/configurable.nix
	pkgs/top-level/all-packages.nix
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* master: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/ruby': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…erimental/parallel-building

* commit 'refs/top-bases/experimental/parallel-building': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* master: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…eclipse

* commit 'refs/top-bases/experimental/eclipse': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* master: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/haxe': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…/firebird

* commit 'refs/top-bases/experimental/firebird': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…tal/opencascade

* commit 'refs/top-bases/experimental/opencascade': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…l/mercurial

* commit 'refs/top-bases/experimental/mercurial': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* master: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/php': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* master: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…blender

* commit 'refs/top-bases/experimental/blender': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/opera': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…op-bases/experimental/nodejs

* experimental/multiple-versions-in-one-file: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…odejs

* commit 'refs/top-bases/experimental/nodejs': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…tal/vim-plugins

* commit 'refs/top-bases/experimental/vim-plugins': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* master: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...

Conflicts:
	pkgs/development/libraries/gobject-introspection/default.nix
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…al/gutenprint

* commit 'refs/top-bases/experimental/gutenprint': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/fonts': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…hadow

* commit 'refs/top-bases/experimental/shadow': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
…marc

* experimental/updates: (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...

Conflicts:
	pkgs/development/compilers/urweb/default.nix
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
* commit 'refs/top-bases/experimental/marc': (374 commits)
  adding grunt-sed node package
  phantomjs: upgrade to 1.9.2
  vim: add the missing patches
  vim_configurable: add patches to 7.4.23 (close NixOS#912)
  expect: fix build on freebsd? (close NixOS#981)
  python-selenium: 2.25.0 -> 2.35.0
  haskell-pandoc-citeproc: disable the test suite to fix the build
  git-annex: patch to fix build with recent versions of 'dns' library
  haskell-pandoc: re-generate with recent version of cabal2nix
  haskell-rfc5051: run this build in LANG=en_US.UTF-8 environment
  haskell-hakyll: patch build to succeed with latest version of pandoc
  haskell-pandoc-citeproc: add version 0.1.1
  haskell-rfc5051: add version 0.1.0.2
  haskell-aeson-pretty: add version 0.7
  haskell-ncurses: re-generate with recent version of cabal2nix
  haskellPackages: add list-tries
  haskell-diagrams-lib: jailbreak to fix build with recent semigroups library
  haskell-monoid-extras: jailbreak to fix build with recent semigroups library
  haskell-active: jailbreak to fix build with recent semigroups library
  haskell-certificate: jailbreak to fix build with recent versions of 'pem'
  ...

Conflicts:
	pkgs/development/libraries/gobject-introspection/default.nix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants