3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

88885 commits

Author SHA1 Message Date
Hoang Xuan Phu f822b93e05 android-studio: repackage in an FHS environment
This commit fixes 2 main problems:

  - Android Studio comes with its own package manager. The current
    packaging approach doesn't allow such management. As a result the
    package is unusable (see
    https://github.com/NixOS/nixpkgs/issues/8650 and
    https://github.com/NixOS/nixpkgs/issues/14903). In this version,
    $ANDROID_HOME is _not_ set, allowing Android Studio to deal with the
    Android SDK as it pleases (typically in $HOME/Android/Sdk).

  - Android Studio downloads prebuilt binaries as part of the SDK. These
    tools (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the
    interpreter. An FHS environment is used as a work around for that.
2016-08-10 20:42:16 +08:00
Eelco Dolstra 9c381612ba Merge pull request #17629 from lancelotsix/update_diffutils
diffutils: 3.3 -> 3.4
2016-08-10 14:01:48 +02:00
Lancelot SIX 99f242bd00
diffutils: 3.3 -> 3.4
See http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00004.html
for release announcement.
2016-08-10 13:45:09 +02:00
Domen Kožar ebffa9fd06 flatten: drastically improve performance, see #17626 2016-08-10 12:02:58 +02:00
Matthias C. M. Troffaes ad27f0252e wolfssl: 3.9.6 -> 3.9.8 2016-08-10 11:02:55 +01:00
Frederik Rietdijk 8955dc5e7e Merge pull request #17464 from cransom/cassandra
Cassandra
2016-08-10 11:42:57 +02:00
Frederik Rietdijk c99e8b94c2 Merge pull request #17611 from despairblue/update/atom
update atom
2016-08-10 11:40:51 +02:00
Frederik Rietdijk 111d7a2af4 Merge pull request #17623 from matthewbauer/misc
Misc. hydra fixes
2016-08-10 11:35:44 +02:00
Frederik Rietdijk b57a20b889 Merge pull request #15949 from leenaars/pygnutlsfixed
Python-gnutls fixed + various new python libraries
2016-08-10 10:49:52 +02:00
Franz Pletz 38f322f2cf tlsdate: 0.0.12 -> 0.0.13 2016-08-10 07:12:08 +02:00
Franz Pletz 3b165fdacf dibbler: init at 1.0.1 2016-08-10 07:12:08 +02:00
Franz Pletz bba9728cd6 jool: 3.4.2 -> 3.4.4 2016-08-10 07:12:08 +02:00
Franz Pletz aec9abc8e1 iputils: 20121221 -> 20151218 2016-08-10 07:12:08 +02:00
Robin Gloster b08247f1e4 ptlib: 2.10.10 -> 2.10.11, add check for SSLv3 2016-08-10 07:12:08 +02:00
Franz Pletz 347c1ed8a0 libshout: 2.3.1 -> 2.4.1 2016-08-10 07:12:08 +02:00
Franz Pletz 6c7326aedd lolcode: fix build 2016-08-10 07:12:08 +02:00
Franz Pletz 43c663975c lolcode: 0.10.5 -> 0.11.2 2016-08-10 07:12:08 +02:00
obadz 3822c56e1e chromium: minor fixups
cc @aszlig
2016-08-10 02:35:59 +01:00
Matthew 0bb4604b0b i-score: update sha
Somehow, the sha256 has been changed. This seems to be from the
different submodules within the repository.
2016-08-09 21:56:42 +00:00
Matthew 9e72be00bc hevea: 2.28 -> 2.29
2.28 is no longer available at that url
2016-08-09 21:43:42 +00:00
Matthew 8d3036ff2e perlPackages.mimeConstruct: only "out" output
http://hydra.nixos.org/build/38074006/nixlog/1
2016-08-09 21:34:20 +00:00
Matthew 1c870804d1 opkg: add libxml2 as input
This caused the failures seen here:

http://hydra.nixos.org/build/38313838/nixlog/1
2016-08-09 21:24:59 +00:00
Matthew aa9cd7b66d sooperlooper: use autconf correctly 2016-08-09 21:19:34 +00:00
Matthew 473a656426 vacuum-im: add -lz to NIX_LDFLAGS
This should be fixed upstream, but it's broken regardless.

http://hydra.nixos.org/build/38322959/nixlog/1
2016-08-09 21:09:28 +00:00
Matthew 0540e567a8 uksmtools: delete
Sources are not available from GitHub anymore and it appears to be
unmantained. A request was sent to the AUR mailing list to delete it on
May 26, 2016:

https://lists.archlinux.org/pipermail/aur-requests/2016-May/011706.html
2016-08-09 21:06:27 +00:00
Robert 88f3d043b6 wscat: init at 1.0.1 (#17618) 2016-08-09 22:59:25 +02:00
Matthew 7833781b43 wikicurses: fix build error
It would error when a config file was missing. This patch comes from
github and can be removed once 4b944ac339312b642c6dc5d6b5a2f7be7503218f
is included in a release.
2016-08-09 20:58:52 +00:00
obadz 582313bafe nixos: remove rsync from base install and add explicit path in nixos-install
As per 60b3f95ad8 (commitcomment-18507812)
2016-08-09 21:39:40 +01:00
obadz 57b7c3c545 nixos-install: more robust way of sourcing fresh version of self 2016-08-09 21:39:40 +01:00
Stefan Junker 918b11e64c rkt: 1.11.0 -> 1.12.0 (#17620) 2016-08-09 22:23:05 +02:00
Matthew 8dd63abfd3 baekmuk-ttf: update url 2016-08-09 20:18:21 +00:00
Matthew ffb502d157 gdouros: remove broken fonts
Some of these fonts are still available but their url has moved and
their hash has been changed. If anyone still uses them, feel free to add
them back.
2016-08-09 20:11:07 +00:00
Dan Peebles 4c43ac2db5 jsonnet: 0.8.7 -> 0.8.9 2016-08-09 19:39:46 +00:00
Fabian Schmitthenner b91fc3f8d0 fix typo (#17621) 2016-08-09 21:15:55 +02:00
Vladimír Čunát 6152cf32e3 texlive: drop unused lesstif parameter
Fixes #17359. /cc #16391.
2016-08-09 20:52:58 +02:00
Robin Gloster 2005711164 Merge pull request #17613 from despairblue/update/flow
flow: 0.28.0 -> 0.30.0
2016-08-09 17:57:24 +00:00
Moritz Ulrich 9626707e2b systemd-cryptsetup-generator: Add note to revert 3efadce. 2016-08-09 19:21:58 +02:00
Moritz Ulrich 3efadce03b systemd-cryptsetup-generator: Fix installPhase. 2016-08-09 19:21:25 +02:00
Robin Gloster 3cf5d5ebed nginx module: fixup events in config 2016-08-09 17:11:28 +00:00
obadz 74b3ad148d nixos/tests/installer.nix: add libxml2 & libxslt to prevent download attempts 2016-08-09 17:01:42 +01:00
Lancelot SIX 6c857c9207
pythonPackages.pysftp: 0.2.8 -> 0.2.9 2016-08-09 17:38:49 +02:00
Lancelot SIX 1d96ca3a3e
pythonPackages.ansible2: Add pycrypto dependency
This used to be propagated by paramiko
2016-08-09 17:38:29 +02:00
Lancelot SIX 34778273b1
pythonPackages.ansible: Add pycrypto dependency
This used to be propagated by paramiko
2016-08-09 17:37:54 +02:00
aszlig f8fad62c8e
Merge branch 'nixpkgs-git-revision-fix'
Addresses #17218 in a better way in that it doesn't create a
".git-revision" file on every nixos-rebuild, because we already have
".git" available. Even if we don't nixos-rebuild can't create the
"git-revision" file.

Tested via:

nix-build -E '(import ./nixos/tests/make-test.nix {
  name = "foo";
  machine = {};
  testScript = "startAll; $machine->execute(\"nixos-version >&2\");";
})'

Closes: #17610
Acked-by: @bennofs
2016-08-09 17:34:35 +02:00
Lancelot SIX 5d7777a288
pythonPackages.paramiko: 1.15.1 -> 2.0.2 2016-08-09 17:33:10 +02:00
Robin Gloster 19f398870a Merge pull request #17614 from kamilchm/vagrant-plugin-fix
vagrant: FIX #16837 vagrant plugin install
2016-08-09 15:27:39 +00:00
Kamil Chmielewski 5d5b2d3f8f vagrant: FIX #16837 vagrant plugin install 2016-08-09 17:07:43 +02:00
Danny Arnold 21102b1589 flow: 0.28.0 -> 0.30.0 2016-08-09 16:51:13 +02:00
Danny Arnold c15795a082 atom: 1.9.0 -> 1.9.6 2016-08-09 16:47:00 +02:00
aszlig 0b9d9eded1
nixos/version: Try to get Git revison from .git
Let's first try if we can determine the Git revision from the .git
directory and if that fails, fall back to get the info from the
".git-revision" file... and after that use something generic like
"master".

This should address #17218 in better way, because we don't need to
create another redundant file in the source checkout of nixpkgs.

I'm not going to route of falling back to using .git, because after
55d881e, we already have ".git-revision" files in people's Git
repositories, which in turn means that nixos-version will report that
old file every time even if the working tree has updated.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @bennofs, Profpatsch
Reported-by: @devhell
Fixes: #17218
2016-08-09 14:18:20 +02:00