1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
Commit graph

75834 commits

Author SHA1 Message Date
aszlig bfb11fd030
buildEnv: Skip content check on ignoreCollisions.
Checking file contents is redundant in this case, because we will go
ahead anyway, regardless of whether the content is the same.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 03:56:09 +01:00
aszlig 4529ed1259
buildEnv: Check the content of colliding paths.
Originally wanted to include ignoreCollisions in cups-progs, but I think
it's better if we use ignoreCollisions only if there are _real_
collisions between files with different contents.

Of course, we also check whether the file permissions match, so you get
a collision if contents are the same but the permissions are different.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 03:54:22 +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 cd11d91f0a jobs -> systemd.services
missed an override
2016-01-17 22:05:13 +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
Robin Gloster 101125d184 Merge pull request #12441 from k0ral/acpid
Add volume and cd events to acpid configuration
2016-01-17 21:57:58 +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
Robin Gloster 4a0692a5fb types: remove references to new packageSet
Reverts part of a04a7272aa

packageSet is slated to be introduced in #11866 but currently causes
evalation errors.

/cc @ts468
2016-01-17 19:49:38 +00: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
Thomas Strobel a04a7272aa Add missing 'type', 'defaultText' and 'literalExample' in module definitions
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +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
rnhmjoj 641a951c61 i18n: Fix vconsole colorscheme generation
Close #12442.
abbradar: remove trailing spaces.
2016-01-17 20:24:45 +03: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
Louis Taylor 96bb93a5a1 pythonPackages.ruamel_ordereddict: init at 0.4.9 2016-01-17 16:31:10 +00:00
Louis Taylor a5846c6c51 pythonPackages.ruamel_yaml: init at 0.10.13 2016-01-17 16:31:05 +00:00
Louis Taylor d0db3c2d52 pythonPackages.future: 0.14.3 -> 0.15.2 2016-01-17 16:30:57 +00:00
Louis Taylor 84c8763a17 pythonPackages.whichcraft: init at 0.1.1 2016-01-17 16:30:52 +00:00
Louis Taylor 6f94a131e8 pythonPackages.binaryornot: init at 0.4.0 2016-01-17 16:30:42 +00:00
Robin Gloster 11468de4a1 Merge pull request #12421 from otwieracz/0ad_0.18_to_0.19
0ad: 0.18 -> 0.19
2016-01-17 16:55:24 +01:00
Arseniy Seroka a69192df2b Merge pull request #12431 from henrytill/racket-6.3
racket: 6.2.1 -> 6.3, add parameter to enable building docs
2016-01-17 18:36:44 +03:00