Commit graph

148982 commits

Author SHA1 Message Date
Matthew Pickering 1c9af2d89c Remove unecessary option 2018-08-15 09:10:42 +01:00
Matthew Pickering 86b966f108 Patches for saga-6.3.0 2018-08-15 09:10:28 +01:00
Matthew Pickering 8a4661588a Fixes for rebase 2018-08-12 22:13:00 +01:00
Matthew Pickering 5caa3fcae9 Small fixes 2018-08-12 10:36:43 +01:00
Matthew Pickering bcab40610b Remove duplicated attribute 2018-08-11 23:08:17 +01:00
Matthew Pickering 115027abe1 Fix linux build 2018-08-11 22:38:01 +01:00
Matthew Pickering f5b097b346 Build QGIS with SAGA plugins 2018-08-11 22:38:00 +01:00
Matthew Pickering 7262b88b0a saga_2_3_2: Init at 2.3.2
This is the lts branch of SAGA which is currently used by QGIS 2.18.x
series.
2018-08-11 22:37:59 +01:00
Matthew Pickering cce0fc8fe5 saga: Build on darwin
There are some unresolved dependency issues which means a lot of
additional dependencies have to be added explicitly on darwin but not on
linux. Maybe something to do with libtool.

See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
2018-08-11 22:37:55 +01:00
Matthew Pickering 2891beb31c vigra: Build on darwin 2018-08-11 22:36:48 +01:00
Matthew Pickering 9c34d1069f libiodbc: Build on darwin 2018-08-11 22:36:47 +01:00
Matthew Pickering c79d054a4c libharu: Build on darwin 2018-08-11 22:36:46 +01:00
Franz Pletz b5b11e9da4
Merge pull request #44900 from volth/patch-228
libvirt: fix dlopen("libjansson.so.4")
2018-08-11 20:24:11 +00:00
Bjørn Forsman ee1b7bf831 aspellDicts: use shortName to keep DRY
Prevents typos like the ones fixed in the parent commit.
2018-08-11 21:35:37 +02:00
Bjørn Forsman ada797e9aa aspellDicts: fix typos in shortName
Affected dicts: nn, pt_BR, pt_PT
2018-08-11 21:35:37 +02:00
zimbatm 1e65420eb3
virtualbox module: allow to pass the package (#44907) 2018-08-11 19:40:00 +01:00
Vaibhav Sagar c7596ef742 ghc861: 8.6.1-alpha2 -> 8.6.1-beta1 (#44891) 2018-08-11 19:06:36 +01:00
John Ericson af36123747 .github/CODEOWNERS: Add myself as for some stdenv stuff 2018-08-11 13:57:53 -04:00
Vladimír Čunát 838d63eced
Merge #44885: firefox*: 61.0.1 -> 61.0.2 2018-08-11 19:47:02 +02:00
Vladimír Čunát d4741d79e1
Merge #44603: thunderbird*: 52.9.1 -> 60.0 2018-08-11 19:47:02 +02:00
Michael Weiss b28f8b4c94 signal-desktop: 1.15.3 -> 1.15.4 2018-08-11 19:27:43 +02:00
Timo Kaufmann c85748baaf
Merge pull request #44882 from nonfreeblob/crawl-0.22.0
crawl: 0.21.1 -> 0.22.0
2018-08-11 18:22:49 +02:00
nonfreeblob 3d56684d95 crawl: 0.21.1 -> 0.22.0 2018-08-11 18:10:19 +03:00
volth d46cfd2ff0
libvirt: fix dlopen("libjansson.so.4") 2018-08-11 13:58:06 +00:00
Bas van Dijk b26fcaa5c0 pgmanage: 10.3.0 -> 10.3.1 2018-08-11 15:49:32 +02:00
Timo Kaufmann 921e5ceef3
Merge pull request #44894 from markuskowa/sqlite-lic
Fix licenses (#43716)
2018-08-11 15:31:29 +02:00
Markus Kowalewski 6aa7ef1133
sshuttle: add license 2018-08-11 14:36:01 +02:00
Markus Kowalewski c2cfaec0c9
ssmtp: add license 2018-08-11 14:34:24 +02:00
Markus Kowalewski e91ef7c74c
sshpass: add license 2018-08-11 14:33:52 +02:00
Markus Kowalewski 4622596d63
sshfs-fuse: add license 2018-08-11 14:33:17 +02:00
Markus Kowalewski 31d2f03fb9
sqsh: add license 2018-08-11 14:33:05 +02:00
Markus Kowalewski a647d07f4c
sqlite,sqlar: add licenses 2018-08-11 14:32:05 +02:00
Jörg Thalheim 5fc5e0642b
Merge pull request #44892 from volth/patch-228
libvirt: jansson required for qemu suppport
2018-08-11 12:56:10 +02:00
Yegor Timoshenko 501607e0ee
Merge pull request #43068 from yegortimoshenko/qdigidoc
libdigidoc, libdigidocpp, qdigidoc updates
2018-08-11 13:13:22 +03:00
Pascal Wittmann c53c9986bd
Merge pull request #44358 from NixOS/add-missing-licenses
Add missing licenses
2018-08-11 11:32:58 +02:00
volth df05344d96
libvirt: jansson required for qemu suppport 2018-08-11 09:19:09 +00:00
Sarah Brofeldt b92956d4c6
Merge pull request #44819 from imalsogreg/okta-aws-init
aws-okta: init at 0.19.0
2018-08-11 10:48:28 +02:00
Bas van Dijk 9481513360 cabal2nix: fix build by overriding hpack to 0.29.6
Fixes: https://github.com/NixOS/cabal2nix/issues/369
2018-08-11 10:44:27 +02:00
Bas van Dijk e9b7e73120
Merge pull request #44356 from ElvishJerricco/callcabal2nix-passthru-deriver
callCabal2nix: Passthru deriver
2018-08-11 10:34:06 +02:00
Pascal Wittmann bd4ef2def3
calibre: 3.28.0 -> 3.29.0 2018-08-11 10:00:52 +02:00
R. RyanTM b728f5cd72 libytnef: 1.9.2 -> 1.9.3 (#44662) 2018-08-11 07:58:22 +00:00
R. RyanTM 498be8d390 urh: 2.2.2 -> 2.2.3 (#44669) 2018-08-11 07:57:14 +00:00
Pascal Wittmann a34579e01e
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/tools/networking/network-manager/fortisslvpn.nix
2018-08-11 09:36:34 +02:00
Michael Raskin 40dea2488f vim_configurable: make gvim command launch GUI again 2018-08-11 10:25:21 +03:00
Orivej Desh c2cf0c5f4c gdal: build with xml support 2018-08-11 00:58:31 +00:00
Samuel Dionne-Riel cfb7ccb08c
Merge pull request #44840 from nicknovitski/mruby-init
mruby: init at 1.4.1
2018-08-10 19:34:22 -04:00
Samuel Dionne-Riel 53bfb47e1d mruby: Removes a test that fails in the sandbox. 2018-08-10 19:07:20 -04:00
Samuel Dionne-Riel f847155014 mruby: Fixes build on Linux
I'm not sure of the semantics of `gcc` vs. `ld` for linking, but it
makes the difference between working and:

```
/nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/ld: warning: cannot find entry symbol _start; defaulting to 0000000000401100
```
2018-08-10 19:07:17 -04:00
Nick Novitski c26a6db0f8 mruby: init at 1.4.1 2018-08-10 18:59:38 -04:00
aszlig f51dc2a94b
nixos/tests/luksroot: Fix OCR of passphrase prompt
Since a9d69a74d6, the passphrase prompt
now no longer starts with "Enter passphrase for" but now it's just
"Passphrase for", which causes the luksroot installer test to fail.

I've tested this on a x86_64-linux machine and the test now succeeds.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @oxij, @samueldr
Issue: #29441
2018-08-11 00:07:10 +02:00