3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

91453 commits

Author SHA1 Message Date
Domen Kožar fc74bf2ccc qgis: fix build
(cherry picked from commit dccf8c5f27)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-11 21:20:50 +02:00
Edward Tjörnhammar e917e47045
android-studio: 2.1.2.0 -> 2.1.3.0 2016-09-11 20:38:20 +02:00
Jaka Hudoklin 272c59a75b go_1_7: 1.7 -> 1.7.1 2016-09-11 20:22:17 +02:00
aszlig b4e2b6bc6a
nixos/lib/testing: Fix unsetting $xchg
Regression introduced by 4dcb685af9.

Unsetting the environment variable shortly before using it is not going
to end up very well, so let's just filter out the variable from the
output of export and unset it shortly afterwards.

This fixes the runInMachine NixOS test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-09-11 17:31:12 +02:00
Nikolay Amiantov 38ae858e28 Merge pull request #18514 from Baughn/steam
steam: Some games use Mono
2016-09-11 19:20:25 +04:00
Svein Ove Aas 70e4eab55b steam: Some games use Mono 2016-09-11 16:17:57 +01:00
aszlig 4ac7b7d5de
nixos/modules/rename: Remove docker-registry
This is a follow-up to 9c1cdedcba and
fed3501b07.

Discussion:

https://github.com/NixOS/nixpkgs/issues/18209#issuecomment-245968857

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @domenkozar
Issue: #18209
2016-09-11 16:51:20 +02:00
Tuomas Tynkkynen b308b1e9bf Merge remote-tracking branch 'upstream/master' into staging 2016-09-11 14:19:02 +03:00
Vladimír Čunát 5a9cbd6b5e libarchive: use pkgconfig
It tends to make builds more reliable, in general.
2016-09-11 12:02:08 +02:00
Vladimír Čunát 554558e3ca Merge #17834: libarchive: make XAR support configurable 2016-09-11 11:51:59 +02:00
Vladimír Čunát 856b4623c4 libarchive: include XAR support by default
Discussion:
https://github.com/NixOS/nixpkgs/pull/17834
2016-09-11 11:51:04 +02:00
Tuomas Tynkkynen 2b0eace6cf Merge remote-tracking branch 'upstream/staging' into master 2016-09-11 11:41:18 +03:00
Vladimír Čunát a49cb9dcbe llvmPackages: generalize "3.9.0" string occurrences
Discussed:
https://github.com/NixOS/nixpkgs/commit/15af9082eb#commitcomment-18903919
2016-09-11 10:13:34 +02:00
Franz Pletz 5c38882f38
toxvpn service: doesn't require online network
Tested that it detects network changes quickly.
2016-09-11 08:16:55 +02:00
Franz Pletz c58654e2b7
treewide: fix fallout of ip-up deprecation
See #18319 for details. Starting network-online.target manually does not
work as it hangs indefinitely.

Additionally, don't treat avahi and dhcpcd special and sync their systemd units
with the respective upstream suggestion.
2016-09-11 08:13:04 +02:00
Peter Simons 3d479813f5 Merge pull request #18497 from aneeshusa/add-z3-dependency-for-cryptol
cryptol: Make Z3 available for REPL users
2016-09-11 01:15:58 +02:00
Tom von Schwerdtner 9a2f40c024 gocd-agent: 16.7.0-3819 -> 16.9.0-4001 2016-09-10 18:33:14 -04:00
Tom von Schwerdtner 18f26f3563 gocd-server: 16.7.0-3819 -> 16.9.0-4001 2016-09-10 18:32:43 -04:00
Tuomas Tynkkynen 628c86c51a release-lib: Remove unused allowTexliveBuilds option
This is dead code since the old monolithic TeXLive was dropped in
da421bc75f.
2016-09-11 01:13:49 +03:00
Tom von Schwerdtner e934231029 gocd-server: add startupOptions, empty extraOptions
The extraOptions option has default values which seems surprising.  This
moves those values to startupOptions (which is what gocd-agent uses) and
empties out the default extraOptions.

The gocd-agent startupOptions description was also changed to remove the
mention of the example (given there isn't one).
2016-09-10 17:52:06 -04:00
Tuomas Tynkkynen ffddcc8807 vlc_npapi: Fix hash 2016-09-11 00:21:16 +03:00
Aneesh Agrawal 54ff118477 cryptol: Make Z3 available for REPL users
The Cryptol REPL has a hard dependency on Z3, but the rest of the
library uses SBV to support multiple solvers. Ensure that Z3 is
available for `pkgs.cryptol`, which is likely to be installed via
nix-env for REPL usage, but do not change pkgs.haskellPackages.cryptol,
which is likely to be used as a dependency (in Nix expressions).
2016-09-10 17:15:51 -04:00
Tuomas Tynkkynen 0dbfb0fc48 Merge commit 'bd6e40c' from staging into master
Major changes being pulled in:

- mesa: maintenance 12.0.1 -> 12.0.2
- texlive: 2015 -> 2016
2016-09-10 23:23:44 +03:00
Peter Simons d01416ba50 Merge pull request #17997 from teozkr/fix/buildstackproject-stackroot
buildStackProject: Fix missing STACK_ROOT causing build errors
2016-09-10 22:23:02 +02:00
Peter Simons b89fa5fd5c Merge pull request #17145 from kalhauge/haskell_darwin_dyld
haskell-ghc: fix darwin issue
2016-09-10 22:11:56 +02:00
Chris Martin e4b146b041 haskell-hasktags: don't install the "test" binary
Closes https://github.com/NixOS/nixpkgs/pull/18403.
2016-09-10 22:09:11 +02:00
Peter Simons 51932e3d69 idris: clean up overrides
Closes https://github.com/NixOS/nixpkgs/pull/18309.
2016-09-10 22:01:15 +02:00
Kirill Boltaev 86557f9ffd mpv: 0.19.0 -> 0.20.0 (#18493)
Enable vaapiSupport by default.
2016-09-10 21:56:49 +02:00
Peter Simons 04e4c495bb haskell-configuration-common: cosmetic 2016-09-10 21:00:22 +02:00
Peter Simons 7619f88eb8 haskell-gtk2hs-buildtools: this override does not belong into common 2016-09-10 21:00:22 +02:00
Peter Simons d8af0db284 haskell-yi: remove obsolete "broken" marker
Fixes https://github.com/NixOS/nixpkgs/issues/18188.
2016-09-10 21:00:22 +02:00
Chris Martin d1e23ed8ed mk: md5->sha256 2016-09-10 14:08:26 -04:00
Chris Martin 5a3560fecf gnumake-3.80: md5->sha256 2016-09-10 14:06:13 -04:00
Chris Martin 316f5e8608 pythonPackages.rhpl: md5->sha256 2016-09-10 14:04:49 -04:00
Chris Martin 5ee369902f pythonPackages.breathe: md5->sha256 2016-09-10 14:03:58 -04:00
Chris Martin c9d609d0e2 lua-4: md5->sha256 2016-09-10 13:57:03 -04:00
Chris Martin 6f32f2cc25 ocaml 3.08.0: md5->sha256 2016-09-10 13:56:04 -04:00
Chris Martin f7c0a9c9cc kdesvn: md5->sha256 2016-09-10 13:51:20 -04:00
Chris Martin e417a63e61 scilab: md5->sha256 2016-09-10 13:50:10 -04:00
Chris Martin 2b7a9a8d73 docbook 4.3: md5->sha256 2016-09-10 13:47:23 -04:00
Chris Martin df3bd28097 docbook-ebnf: md5->sha256 2016-09-10 13:46:49 -04:00
Chris Martin ce44f8df5c batik: md5->sha256 2016-09-10 13:46:06 -04:00
Chris Martin ffc3e24e0b cua-mode: md5->sha256 2016-09-10 13:43:18 -04:00
Edward Tjörnhammar 443204aa70
idea.idea14-ultimate: use base32 hash 2016-09-10 19:38:52 +02:00
Edward Tjörnhammar 505cee5c77
idea.idea-{community,ultimate}: 2016.2.3 -> 2016.2.4 2016-09-10 19:38:52 +02:00
aske 0628215f9e linuxPackages.mba6x_bl: 2016-02-12 -> 2016-04-22 2016-09-10 20:27:49 +03:00
Tuomas Tynkkynen c922c20cff e2fsprogs: Split 'dev' 2016-09-10 20:05:30 +03:00
Frederik Rietdijk 3c42ff35ce julia-git: mark as broken for i686 2016-09-10 18:59:30 +02:00
Frederik Rietdijk f6c2afc423 julia: mark as broken for i686 2016-09-10 18:59:30 +02:00
Joachim Fasting 0a6221578a
mpd service: replace script with serviceConfig.ExecStart 2016-09-10 18:30:14 +02:00