Commit graph

65459 commits

Author SHA1 Message Date
Rok Garbas 36fc03edb6 fetchgit: import impure GIT_PROXY_COMMAND and SOCKS_SERVER, fixes #8605
These environment variables allow using fetchgit with git:// URLs using
the SOCKS proxy technique described in 'Using Git with a SOCKS proxy':

  http://www.patthoyts.tk/blog/using-git-with-socks-proxy.html

Briefly, GIT_PROXY_COMMAND is set to a script which invokes connect[1],
which reads SOCKS_PROXY, which might be pointing to a local instance of
'ssh -D'.

[1] pkgs/tools/networking/connect
2016-01-20 02:18:22 +01:00
Vladimír Čunát a7ca9c2105 Revert "glib: fix compilation on SmartOS/Illumos (close #12477)"
This reverts commit 3f9ff30f6d.
Let's go without changing hash instead: e67717bc8d
2016-01-19 17:39:35 +01:00
Danny Wilson 3f9ff30f6d glib: fix compilation on SmartOS/Illumos (close #12477)
Recent illumos includes a linux-incompatible `inotify.h` header, which configure detects: compilation fails.
Also, a newer `dtrace` on SmartOS fails creating the probes ELF linkable object (with `dtrace -G`). Disable for now.

Remove old configure option `--disable-modular-tests`.
2016-01-19 16:06:49 +01:00
Rob Vermaas e775690e5c Fix nixops URL 2016-01-19 09:28:52 +00:00
Rob Vermaas 0cf5c65511 nixops: 1.3 -> 1.3.1 2016-01-18 13:56:28 +00:00
Robin Gloster 53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Vladimír Čunát 620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
vbgl c23b0856fd Merge pull request #12064 from FlorentBecker/eliom42
Eliom42
2016-01-18 09:32:48 +01:00
Tobias Geerinckx-Rice 3f10b2874f Merge pull request #12450 from eduarrrd/pshs
pshs: 0.2.6 -> 0.3
2016-01-18 04:55:25 +01:00
Eduard Bachmakov f3ae60295f pshs: 0.2.6 -> 0.3 2016-01-17 22:44:48 -05:00
Tobias Geerinckx-Rice 34dc7fe49f simple-scan: 3.19.3 -> 3.19.4 2016-01-18 04:26:09 +01:00
aszlig 011c149ed5
mdadm: Set allowedReferences to only include libc.
The updates we had in the past (7719f7f and 1faf610) broke the mdadm
installer test and systems in the wild using mdraid because newer mdadm
versions contained a self-referenc to its own store path.

Instead of putting a big warning about updating in the package
expression, let's just add allowedReferences so the build immediately
fails if there is a self-reference.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 04:21:16 +01:00
aszlig 5e227e6f1d
mdadm: Clean up package expression.
Let's use makeFlags directly instead of stitching together a
makeFlagsArray in preBuild.

This should make the expression much more readable and clean.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 04:21:16 +01:00
aszlig bcd31d0acb
mdadm: 3.3 -> 3.3.4
Okay, this update is a bit more tricky and the patch I've included is
not very nice to be honest.

So the patch causes "mdadm --udev-rules" to search for the right store
path using /proc/self/exec. This has the disadvantage that we could end
up having /run/current-system/bin/mdadm in the rule file.

But on the other hand, when we're on NixOS, we don't need to use that
command *at*all*, so we should be safe.

The patch also sets BINDIR to /sbin, which causes the included rule and
systemd files to not work out of the box on NixOS. But we have a
substituteInPlace where we do rewrite /sbin/mdadm to the right store
path in our udev rule generator, so that shouldn't be an issue.

I've tested this using the mdraid installer test and it succeeded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 04:21:15 +01:00
Tobias Geerinckx-Rice 48fad440f1 Merge pull request #12448 from jb55/terra-patch
terra: init at git-2016-01-06
2016-01-18 03:48:36 +01:00
aszlig 85dd89f6eb
chromium: Remove myself from maintainers
Working on Chromium really drives me nuts due to its build time, also I
really don't have quite a lot of time these days to properly maintain it
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 03:35:28 +01:00
aszlig 38c77bb72c
chromium: Do not rely on import-from-derivation
This has been introduced by me in 690a845 and discovered by @vcunat in
his comment over at:

690a845de9 (commitcomment-14209868)

It's really a bit ugly to have builds running during evaluation, but
back when I made that commit the reason was to avoid having to shell
quote the hell out of it (see the comment in mkPluginInfo for the
reason).

Now we propagate plugin flags and environment variables as a list of
arguments in a plain file that's appended verbatim to makeWrapper, so
it shouldn't do any builds anymore during instantiation.

I have tested this with both just WideVine and just Flash enabled as
well as both in combination and none of the plugins and the output seems
correct. However I didn't test to run Chromium with the new
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Vladimír Čunát <vcunat@gmail.com>
2016-01-18 03:35:28 +01:00
Tobias Geerinckx-Rice 8b57eb8f17 tldr: use fetchFromGitHub; pkgconfig
pkgconfig is unrelated, but trivial (removes a harmless but
distracting error message) and doesn't warrant its own commit.
2016-01-18 03:04:56 +01:00
Tobias Geerinckx-Rice 907481aca8 hack-font: 2.018 -> 2.019 2016-01-18 02:51:17 +01:00
Tobias Geerinckx-Rice ebad3ffeb4 tldr: 1.0 -> 1.1.0; maintain 2016-01-18 02:47:10 +01:00
Tobias Geerinckx-Rice 5db2412159 Merge pull request #12447 from gpyh/fix-android-build-tools
Renamed subdirectories in Android SKD's build-tools
2016-01-18 02:35:59 +01:00
William Casarin e66965fdee terra: init at git-2016-01-06 2016-01-17 17:30:01 -08:00
Tobias Geerinckx-Rice 7f2d6d8ee6 ms-sys: correct licence 2016-01-18 01:41:57 +01:00
Tobias Geerinckx-Rice f0cc8f9ec5 4suite: remove dead package
Project abandoned in 2006. Broken since June 2014.
2016-01-18 01:41:57 +01:00
Tobias Geerinckx-Rice 6f640acfba ms-sys: 2.5.1 -> 2.5.2; maintain
Changes:
  - Added german man page,
  - added support for Grub2 and Grub4Dos MBR,
  - added support for KolibriOS MBR and FAT32 boot record,
  - added support for ReactOS MBR, FAT32 and FAT16 BR,
  - added support for Rufus MBR,
  - added experimental support for large sectors ( > 512),
  - now possible to alter OEM ID of FAT and NTFS boot records.
  - now possible to alter Windows Disk Signature in MBR.
2016-01-18 01:41:57 +01:00
Tobias Geerinckx-Rice 837594fe6b Merge pull request #12363 from expipiplus1/llvm-enable-shared
llvm: Add enableSharedLibraries option to 3.5 and 3.6
2016-01-18 01:41:25 +01:00
Yacine Hmito 1d8313042d Renamed subdirectories in Android SKD's build-tools
Nix unzips the different components of the Android SDK one by one.
It followed the directory structure of complete packages released for
mainstream OS but the names of the directories in build-tools doesn't
match those.
As a result, some programs assuming the usual directory structure and
naming conventions broke (in my case it is a gradle plugin).
This is a fix. It may introduce a regression if some programs rely on
the current behavior.
2016-01-18 00:42:54 +01:00
Franz Pletz 0f107fcb67 3dfsb: Remove package
Package is broken, old and not easily fixable.

See #12397.
2016-01-17 23:57:23 +01:00
Robin Gloster ba4b4752f2 racerRust: 1.0.0 -> 1.1.0 2016-01-17 22:05:25 +00:00
Robin Gloster a80a07865d rustRegistry: 2015-12-23 -> 2016-01-17 2016-01-17 22:05:20 +00:00
Robin Gloster 1cdc7c556a Merge pull request #12445 from 4z3/urlwatch
urlwatch: 1.18 -> 2.0 incl. its new dependency minidb-2.0.1
2016-01-17 22:42:50 +01:00
Peter Simons 1ab1c7166b Merge pull request #12444 from erlang-nix/propagate-build-plugins
Erlang: Pass buildPlugins to rebar3-nix-bootstrap from buildRebar3
2016-01-17 22:36:11 +01:00
tv 180655290d urlwatch: 1.18 -> 2.0 2016-01-17 22:00:39 +01:00
Gleb Peregud ed4373e8b7 Pass buildPlugins to rebar3-nix-bootstrap.
To successfully build rebar packages, it needs to be provided with
rebar3 plugins used to build it. This change passes them to env
variable. From there rebar3-nix-bootstrap takes them and symlinks into
_build/default/plugins.
2016-01-17 21:59:27 +01:00
tv ceaec1a108 minidb: init at 2.0.1 2016-01-17 21:59:22 +01:00
Tobias Geerinckx-Rice 0ef8fa011f sshuttle: 0.74 -> 0.76
And back to fetchurl we go:

  “LookupError: setuptools-scm was unable to detect version for
   '/tmp/nix-build-.../sshuttle-v0.76-src'. Make sure you're not
   using GitHub's tarballs (or similar ones), as those don't
   contain the necessary metadata. Use PyPI's tarballs instead.”
2016-01-17 21:52:36 +01:00
Domen Kožar 9e8eba48ab xorg.xorgserver: wrap Xvfb with required flags 2016-01-17 21:14:49 +01:00
Nikolay Amiantov 00eeae1179 gajim: add extraPythonPackages option
For exampole, this allows to add python-axolotl to PYTHONPATH,
which is needed for OMEMO OTR messaging plugin.
2016-01-17 22:24:14 +03:00
Nikolay Amiantov 49363a40ba python-axolotl: init at 0.1.7 2016-01-17 22:24:10 +03:00
Nikolay Amiantov 4d43687fc1 python-axolotl-curve25519: init at 0.1 2016-01-17 22:24:05 +03:00
Christopher Lübbemeier ebd1a4ca9f spotify: 0.9.17.1 -> 1.0.19.106
changes by @globin:
used wrapper instead of propagatedUserEnvPkgs for zenity

closes #12191

Signed-off-by: Robin Gloster <mail@glob.in>
2016-01-17 19:18:32 +00:00
Pascal Wittmann ff837f9288 Merge pull request #12443 from gebner/lean-ninja
lean: update and add wrapper for linja
2016-01-17 20:00:16 +01:00
Matthias Beyer ae5ef2b009 pygraphviz: init at 1.3
changes by @globin:
1.2 -> 1.3
correct license information

Signed-off-by: Robin Gloster <mail@glob.in>
2016-01-17 18:11:37 +00:00
Robin Gloster 656acf3719 mates: remove package
see #11926 for context

closes #11926
2016-01-17 18:11:08 +00:00
Mateusz Kowalczyk 2be0338ec3 Merge pull request #12329 from luke-clifton/gsasl-krb5
Bring in krb5 for darwin builds seeing as we use
2016-01-17 17:38:50 +00:00
Robin Gloster 1dfdd01ec9 Merge pull request #11589 from kragniz/cookiecutter
Add cookiecutter
2016-01-17 17:57:55 +01:00
Louis Taylor fb9052c098 cookiecutter: init at 1.3.0 2016-01-17 16:53:31 +00:00
Louis Taylor b0ca115059 pythonPackages.chardet: update homepage 2016-01-17 16:31:28 +00:00
Louis Taylor 9fa25759cc pythonPackages.chardet: 2.1.1 -> 2.3.0 2016-01-17 16:31:22 +00:00
Louis Taylor ff5c859460 pythonPackages.ruamel_base: init at 1.0.0 2016-01-17 16:31:17 +00:00