Commit Graph

84715 Commits

Author SHA1 Message Date
Tobias Pflug
68b0f2f500 reattach-to-user-namespace: fix sha (#15871) 2016-06-01 01:40:50 +02:00
Joachim Fasting
961164a8a7
torbrowser: explicitly set paths to torrc-defaults and tor
This patch fixes an issue introduced by b897f825942b63ab790cad9ed66c8a79cbb3fc2d
where the bundled tor fails to run.

The error message claims that it cannot communicate with tor, but what actually
happens is that tor never runs at all, because it is invoked with a non-existent
rc file.  Specifying an absolute path to the torrc-defaults file fixes the
problem.  For good measure, we specify an absolute path to the tor executable
itself as well; we want as little autodetection logic as possible.

Note that users of torbrowser *must* remove the existing `~/.torbrowser4` folder
for this to take effect, otherwise torbrowser will continue to use extension
data from the previous release (this is why some existing users were able to
successfully use the new torbrowser version, see
https://github.com/NixOS/nixpkgs/pull/15854).
2016-05-31 23:37:20 +02:00
Thomas Tuegel
d5d4606190 Revert "cmake: use supplied RPATH instead of guessing"
This reverts commit 8ec5adc953.

This broke stdenv on Darwin, see #15881. A Darwin user will need to fix
the problem and un-revert. This commit causes CMake to use the same
RPATH settings as the compiler, so it is obviously correct.
2016-05-31 16:30:15 -05:00
Michael Raskin
7285c2e107 Merge pull request #15880 from tohl/master
ecl: upstream changed url
2016-05-31 20:42:55 +00:00
Tomas Hlavaty
506fe4e5c1 ecl: upstream changed url 2016-05-31 22:33:18 +02:00
Michael Alan Dorman
5ca5a4f773 gtk2hs-buildtools: hand-code some dependencies
A change in the way the gtk2hs libraries make use of gtk2hs-buildtools
caused them to move the dependency into a stanza where cabal2nix doesn't
pick it up---so we need to do these by hand for the moment.
2016-05-31 22:09:57 +02:00
Michael Alan Dorman
b0f64b04fc pandoc: jailbreak 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
20cf5c9750 hackage2nix: Compile with older deepseq-generics 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
5c803214ee distribution-nixpkgs: Compile with older deepseq-generics 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
607e123d11 ghc-mod: Depend on cabal-helper 0.6.3.1 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
be6c46c3b3 gtk2hs-buildtools: ensure appropriate Cabal version 2016-05-31 22:09:56 +02:00
Michael Alan Dorman
ffe733a52d cereal: Add dependency for 7.10.x compatibility 2016-05-31 22:09:56 +02:00
Michael Alan Dorman
f226dbff00 lens-family-th: restrict version to 7.10.X compatible 2016-05-31 22:09:56 +02:00
Peter Simons
8277beff46 Fix LTS Haskell version of intervals. 2016-05-31 22:09:56 +02:00
Peter Simons
2d1e907c61 Fix LTS Haskell version of aeson. 2016-05-31 22:09:56 +02:00
Peter Simons
7e7c4ff779 Fix LTS Haskell builds of case-insensitive and semigroups. 2016-05-31 22:09:56 +02:00
Peter Simons
0331c3ee8d configuration-hackage2nix.yaml: update list of broken packages 2016-05-31 22:09:56 +02:00
Peter Simons
4825b607f8 configuration-ghc-7.10.x.nix: add missing core library names from GHC 8.x to fix evaluation 2016-05-31 22:09:55 +02:00
Peter Simons
98c03caeac generate-hackage-package-set.nix: drop experimental code from master branch 2016-05-31 22:09:55 +02:00
Peter Simons
fc0c63d369 configuration-ghc-8.0.x.nix: update list of core packages 2016-05-31 22:09:55 +02:00
Peter Simons
4ab2a32888 configuration-ghc-8.0.x.nix: drop obsolete overrides
We're following Stackage Nightly with GHC 8.x now, so problems should be
reported there rather than fixed locally in Nixpkgs.
2016-05-31 22:09:55 +02:00
Peter Simons
2d201d41ca configuration-ghc-7.10.x.nix: update to cabal-install 1.24.x by default 2016-05-31 22:09:55 +02:00
Peter Simons
900aa31644 configuration-hackage2nix.yaml: update list of broken packages 2016-05-31 22:09:55 +02:00
Peter Simons
e343ec0822 Switch default Haskell compiler to GHC 8.0.1. 2016-05-31 22:09:54 +02:00
Peter Simons
577f2b0005 Add LTS Haskell 6.0. 2016-05-31 22:09:54 +02:00
Peter Simons
4cea709ce0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-27-gc573068 using the following inputs:

  - Hackage: b000a1eee6
  - LTS Haskell: 042ef2187b
  - Stackage Nightly: c7757d46b6
2016-05-31 22:09:43 +02:00
Frederik Rietdijk
8851cf3048 Merge pull request #15770 from FRidh/pyparsing
pythonPackages.pyparsing: 2.0.1 -> 2.1.4
2016-05-31 21:57:24 +02:00
Tobias Pflug
71c9c5dffe neovim: fix broken build (#15876) 2016-05-31 21:38:43 +02:00
Franz Pletz
d3e0849785 batman-adv: 2016.0 -> 2016.1 2016-05-31 20:10:26 +02:00
Franz Pletz
498ff955ec sslscan: 1.11.0 -> 1.11.5 2016-05-31 20:10:26 +02:00
Franz Pletz
6ee74b5593 whois: 5.2.11 -> 5.2.12 2016-05-31 20:10:26 +02:00
Franz Pletz
90e8e00097 screen-message: 0.23 -> 0.24 2016-05-31 20:10:26 +02:00
José Romildo Malaquias
f67c878241 mate-icon-theme: move to pkgs/desktops/mate/ 2016-05-31 15:08:51 -03:00
José Romildo Malaquias
e428c0346f mate-themes: move to pkgs/desktops/mate/ 2016-05-31 15:06:43 -03:00
Thomas Tuegel
dd07a28e5d Merge branch 'cmake-rpath' 2016-05-31 13:02:27 -05:00
Thomas Tuegel
94fcfc9c41 extra-cmake-modules: don't change the RPATH settings
We don't need KDE upstream messing up our RPATH.
2016-05-31 13:02:15 -05:00
Thomas Tuegel
ca34e075e4 qt56.qtbase: create symlink farm in one pass 2016-05-31 13:02:14 -05:00
Thomas Tuegel
8ec5adc953 cmake: use supplied RPATH instead of guessing 2016-05-31 13:02:10 -05:00
Domen Kožar
926c9293cb travis-ci: don't check NixOS options on darwin 2016-05-31 18:58:59 +01:00
Frederik Rietdijk
f44e70a68b pypy.withPackages: fix path 2016-05-31 17:17:28 +02:00
Alexey Shmalko
c68e823029 aspell-dict-uk: init at 1.4.0-0 (#15846) 2016-05-31 17:09:01 +02:00
Eelco Dolstra
a00e564e04 gummiboot: Remove 2016-05-31 17:02:56 +02:00
Eelco Dolstra
f222689aba Use systemd-boot instead of gummiboot
Gummiboot is part of systemd now so we may as well use it.
2016-05-31 17:02:47 +02:00
Eelco Dolstra
66d5ca6f42 systemd: Build EFI image 2016-05-31 17:02:33 +02:00
Eelco Dolstra
a2cb4a1d0a gnu-efi: 3.0.3 -> 3.0.4 2016-05-31 17:01:22 +02:00
Matthew Justin Bauer
9dd563bb12 jsoncpp: enable and fix on darwin (#15845) 2016-05-31 16:59:41 +02:00
Robin Gloster
3ecd527af0 Merge pull request #15861 from romildo/new.runningx
runningx: init at 1.0
2016-05-31 16:55:42 +02:00
Robin Gloster
e2cc56f98c Merge pull request #15865 from mpscholten/iterm
iterm2: init at 2.1.4
2016-05-31 16:35:45 +02:00
Robin Gloster
2e4cab183b Merge pull request #15839 from zimbatm/httrack-3.48.22
httrack: 3.48.21 -> 3.48.22
2016-05-31 16:29:04 +02:00
Robin Gloster
385aaa753d Merge pull request #15852 from dguibert/rclone
rclone: init at 1.29
2016-05-31 16:19:07 +02:00