Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

expect: fix build on freebsd #981

Closed
wants to merge 1 commit into from
Closed

expect: fix build on freebsd #981

wants to merge 1 commit into from

Conversation

lovek323
Copy link
Member

I am not sure if this will resolve any of the builds that are failing on hydra, but I couldn't get expect to build on FreeBSD 9.1 (x86_64). It was a simple library naming problem.

If anyone wants me to try building something that depends on expect, let me know.

@vcunat vcunat closed this in 4736e6d Sep 18, 2013
@vcunat
Copy link
Member

vcunat commented Sep 18, 2013

I suppose there's no hurt in trying. We'll see once Hydra gets to it.

MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Sep 19, 2013
@MarcWeber
Merge commit 'refs/top-bases/experimental/multiple-versions-in-one-fi…
159fa26 
…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
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/mingw
8c3b1fc 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/mingw' into experimental/mingw
f213e9a 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/ati' into experimental/ati
eafded0 
* 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
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/xsbt
d878695 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/xsbt' into experimental/xsbt
ccf5b5b 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/inkscape' into experimental…
c35ca19 
…/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
@MarcWeber
Merge commit 'refs/top-bases/experimental/gimp-git' into experimental…
b68cec6 
…/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
@MarcWeber
Merge commit 'refs/top-bases/experimental/nix' into experimental/nix
af97e4a 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/plover' into experimental/p…
ac840ce 
…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
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/imap-sync-update
7da5696 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/imap-sync-update' into expe…
971c537 
…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
@MarcWeber
Merge commit 'refs/top-bases/experimental/overlays' into experimental…
5b13a89 
…/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
@MarcWeber
Merge branch 'experimental/overlays' into refs/top-bases/experimental…
309868e 
…/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
@MarcWeber
Merge branch 'experimental/overlays' into refs/top-bases/experimental…
ade8ef6 
…/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
@MarcWeber
Merge commit 'refs/top-bases/experimental/hack-nix' into experimental…
08d1c97 
…/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
@MarcWeber
Merge commit 'refs/top-bases/experimental/updates' into experimental/…
94470f2 
…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
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/ruby
28f956c 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/ruby' into experimental/ruby
902cc95 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/parallel-building' into exp…
3412564 
…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
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/eclipse
d83843c 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/eclipse' into experimental/…
7ee8694 
…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
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/haxe
7ed4edc 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/haxe' into experimental/haxe
7d7a2a9 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/firebird' into experimental…
7340a5f 
…/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
@MarcWeber
Merge commit 'refs/top-bases/experimental/opencascade' into experimen…
674f3ad 
…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
@MarcWeber
Merge commit 'refs/top-bases/experimental/mercurial' into experimenta…
63bfa44 
…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
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/php
f6e60ee 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/php' into experimental/php
6d9bce3 
* 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
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/blender
a54cfd1 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/blender' into experimental/…
4d057f5 
…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
@MarcWeber
Merge commit 'refs/top-bases/experimental/opera' into experimental/opera
3c70490 
* 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
@MarcWeber
Merge branch 'experimental/multiple-versions-in-one-file' into refs/t…
d5e0abf 
…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
@MarcWeber
Merge commit 'refs/top-bases/experimental/nodejs' into experimental/n…
2f57329 
…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
@MarcWeber
Merge commit 'refs/top-bases/experimental/vim-plugins' into experimen…
2205cbd 
…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
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/gutenprint
ce35739 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/gutenprint' into experiment…
1dc745b 
…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
@MarcWeber
Merge commit 'refs/top-bases/experimental/fonts' into experimental/fonts
143dd88 
* 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
@MarcWeber
Merge commit 'refs/top-bases/experimental/shadow' into experimental/s…
0c8bc2f 
…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
@MarcWeber
Merge branch 'experimental/updates' into refs/top-bases/experimental/…
8b7f1f3 
…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
@MarcWeber
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc
db6addf 
* 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
@vcunat
Copy link
Member

vcunat commented Sep 23, 2013

FYI, it still seems to live-lock on Hydra http://hydra.nixos.org/build/6208609.

Ouch, my and @MarcWeber's commit styles are co-creating quite a spam in github PRs :-)

@MarcWeber
Copy link
Contributor

Excerpts from Vladimír Čunát's message of Mon Sep 23 13:17:39 +0200 2013:

Ouch, my and @MarcWeber's commit styles are co-creating quite a spam in github PRs :-)
Should I change tg merge settings ? I'll think about it.

klemensn added a commit to klemensn/nixpkgs that referenced this pull request Jun 3, 2022
@klemensn
qdigidoc: Update to 4.2.11
3e5b838 
This release is still subject to double-free crashes in at least the
signature verification functionality, but debugging that requires an up
to date version (released two months ago), so here we go.

NB: Upstream released two source tarballs without further information,
qdigidoc4_r.2.11.110.orig.tar.xz contains sources without subdirectory,
qdigidoc4_r.2.11.110-1804.tar.xz contains a subdirectory with sources;
their difference is irrelevant for our build, so pick the one 1804 one:
```
$ diff -u -r qdigidoc4_r.2.11.110.orig/ qdigidoc4_r.2.11.110-1804/qdigidoc4/
Only in qdigidoc4_r.2.11.110.orig/cmake: .git
Only in qdigidoc4_r.2.11.110.orig/common: .git
Only in qdigidoc4_r.2.11.110.orig/common: .gitmodules
diff '--color=auto' -u -r qdigidoc4_r.2.11.110.orig/debian/changelog qdigidoc4_r.2.11.110-1804/qdigidoc4/debian/changelog
--- qdigidoc4_r.2.11.110.orig/debian/changelog	2022-01-28 13:44:35.000000000 +0200
+++ qdigidoc4_r.2.11.110-1804/qdigidoc4/debian/changelog	2022-01-28 13:44:38.000000000 +0200
@@ -1,3 +1,9 @@
+qdigidoc4 (4.2.11.110-1804) unstable; urgency=medium
+
+  * Release: 4.2.11.110.
+
+ -- RIA <[email protected]>  Fri, 28 Jan 2022 13:44:38 +0200
+
 qdigidoc4 (0.2.0.3) stable; urgency=low

   * Initial release
Only in qdigidoc4_r.2.11.110.orig/extensions/cmake: .git
Only in qdigidoc4_r.2.11.110.orig/extensions: .git
Only in qdigidoc4_r.2.11.110.orig/extensions: .gitmodules
```

```
$ git log --oneline v4.2.9..v4.2.11
2631e24 (tag: v4.2.11) Update translation (NixOS#1025)
76c671a Support Fedora (NixOS#997)
639cebe Update Qt to 5.12.2 (NixOS#1019)
cde7fb8 Add web-eid to diagnostics (NixOS#989)
faa8276 Add default option to sign button (NixOS#1001)
cb8262a Update OpenLDAP 2.6.0 (NixOS#996)
132de43 Workaround for Yaru theme on ubuntu 21.10 (NixOS#994)
58e4278 Improve safeFilename (NixOS#986)
1710f47 Fix coverity and cppcheck warnings (NixOS#992)
60af0bb Remove autofocus (NixOS#981)
5a9ff0a Use thread monitor event state (NixOS#845)
cdd95a5 Fix LDAP certificate validation (NixOS#980)
92f81ec Workaround SID/MID proxy unicode issues (NixOS#982)
92a5aaa Update version number and OpenSSL, OpenLDAP versions (NixOS#977)
5971e54 Update Xalan-C 1.12 (NixOS#976)
1f848cf Add more specific info for OpenSSLExceptions (NixOS#970)
0497b7f Set Select folder dialog button label and fix some translation warnings (NixOS#974)
e56e814 Workaround recent Qt changes to pass mousePressEvent (NixOS#978)
44f4a7e Update translations in russian for settings (NixOS#973)
25756eb Wait for upper level operations to avoid locked screen (NixOS#979)
232784e Don't set focus to fonds image (NixOS#967)
5cf2157 Change the view of expired and expiring certificates (NixOS#965)
b001274 Resolve a yellow background, when PIN is locked (NixOS#971)
4b20375 Fix the boolean value (NixOS#975)
1a41817 Resolve Ubuntu 21.04 warnings (NixOS#946)
301178b Set read-only permission for files in signed container (NixOS#962)
e028a30 Update OpenLDAP 2.5.5 (NixOS#963)
1fb5f6a Set accessible name to pin (NixOS#966)
18e6112 Handle libdigidocpp exception (NixOS#943)
a9efe0f Update translations (NixOS#961)
06e44a0 Fix Linux dark theme (NixOS#950)
a6ff428 Fix missed border of Accordion (NixOS#960)
a14476c Update list of components in Info view (NixOS#958)
8980270 Fix normalization of filenames (NixOS#952)
e4aac44 Shorten notifications display time (NixOS#948)
14606dc Use QSysInfo for OS version (NixOS#931)
b8716e7 Resolve a yellow background, when PIN is locked (NixOS#947)
0319c6b Don't allow searching for spaces during encryption (NixOS#929)
```
@kaocher82 kaocher82 mentioned this pull request Jul 7, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lovek323 @vcunat @MarcWeber