Frederik Rietdijk
a18b493e02
Merge master into staging
2018-05-09 10:48:01 +02:00
xeji
70963b382f
Merge pull request #40192 from jbedo/singfile
...
singularity: add missing file dependency
2018-05-09 10:36:11 +02:00
xeji
cbe420d6d7
Merge pull request #40206 from dywedir/bat
...
bat: 0.2.0 -> 0.3.0
2018-05-09 10:28:21 +02:00
Matthew Justin Bauer
f4c5062040
Merge pull request #39105 from magnetophon/vamp-sdk
...
vamp-sdk: 2.5 -> 2.7.1
2018-05-09 08:13:00 +00:00
Matthew Justin Bauer
118d9d7489
Merge pull request #39130 from veprbl/pr/graphicsmagick-imagemagick-compat
...
Implement graphicsmagick-imagemagick-compat
2018-05-09 08:12:13 +00:00
Dmitry Kalinkin
0d78386e21
rivet: switch to graphicsmagick
2018-05-09 03:11:19 -05:00
Dmitry Kalinkin
9b7d3f10e4
graphicsmagick-imagemagick-compat: init at 1.3.28
2018-05-09 03:11:19 -05:00
Frederik Rietdijk
8ff2dca388
Merge pull request #38939 from NixOS/python-unstable
...
python.pkgs: pip 9.0.3 -> 10.0.1
2018-05-09 10:01:25 +02:00
Matthew Justin Bauer
e203a9a553
pthread-w32: add missing args
...
Fixes #40207
2018-05-09 02:51:59 -05:00
Vladyslav Mykhailichenko
97263dfb92
bat: 0.2.0 -> 0.3.0
2018-05-09 10:15:35 +03:00
Matthew Justin Bauer
0481467282
Merge pull request #40148 from rkoe/add/ext4magic
...
ext4magic: init at 0.3.2
2018-05-09 06:12:12 +00:00
Matthew Justin Bauer
1d3fe7d894
Merge pull request #39576 from veprbl/pr/py3_distutils_fix
...
python3: add C++ compiler support for distutils
2018-05-09 06:11:44 +00:00
Matthew Justin Bauer
b73b8e0fa0
Merge pull request #40176 from emmanuelrosa/gnucash24
...
gnucash: restore version 2.4
2018-05-09 06:06:32 +00:00
Vincent Laporte
1276e82c2e
coqPackages.dpdgraph: init at 0.6.3 for Coq 8.8
2018-05-09 08:03:10 +02:00
Matthew Justin Bauer
fba7c3adf8
Merge pull request #40195 from emmanuelrosa/webkitgtk-xdamage
...
webkitgtk: add missing libXdamage dependency
2018-05-09 01:52:35 +00:00
Emmanuel Rosa
a4c86b421f
webkitgtk: add missing libXdamage dependency
...
Closes #40193
2018-05-08 21:42:17 -04:00
Jan Tojnar
2be9f02201
gnome3.gnome-clocks: add fallback sound theme
2018-05-09 03:12:41 +02:00
Justin Bedo
48808f1c93
singularity: add missing file dependency
2018-05-09 10:19:38 +10:00
Matthew Justin Bauer
92af917827
git-secrets: fix homepage url
2018-05-08 18:17:44 -05:00
Matthew Justin Bauer
03308d1298
Merge pull request #40187 from matthewbauer/disable-framework-for-qt
...
Disable installing frameworks for qt
2018-05-08 22:55:12 +00:00
Uli Baum
b7ad8d667c
Revert "poppler_data: 0.4.8 -> 0.4.9" ( #39524 )
...
This reverts commit 95d1d753dc
.
See discussion in #39742
2018-05-09 00:20:26 +02:00
Uli Baum
ae8d6b08fd
Revert "poppler_utils: 0.63.0 -> 0.64.0" ( #39742 )
...
This reverts commit 3dfe97c62d
.
Breaks texlive.bin.core build, see discussion in #39742
2018-05-09 00:18:09 +02:00
Robert Helgesson
88946527a5
eclipse-plugin-jsonedit: 1.1.0 -> 1.1.1
2018-05-08 23:20:15 +02:00
xeji
86b37d1f94
Merge pull request #40173 from taku0/flashplayer-29.0.0.171
...
flashplayer: 29.0.0.140 -> 29.0.0.171
2018-05-08 23:06:56 +02:00
xeji
c53e3d2688
Merge pull request #40142 from rkoe/fix/i3lock-description
...
i3lock/i3lock-color: meta: improve description
2018-05-08 22:58:51 +02:00
xeji
e7f3dab666
Merge pull request #40172 from scalavision/master
...
singularity: 2.4.6 -> 2.5.1
2018-05-08 22:53:39 +02:00
Matthew Bauer
c4cac55d69
qt510: disable framework build on macOS
...
We prefer to have $out/include & $out/lib installed so that things
like multiple outputs can work. There is no way to do this in Qt
currently without also disabling the ‘framework’ install. Not sure if
this will break anything but it will fix issues we run into on some
projects like python2.7-pyside:
Linux: https://hydra.nixos.org/build/73219181
macOS: https://hydra.nixos.org/build/73059550
Hopefully this gives us consistency between the two.
2018-05-08 15:46:57 -05:00
Matthew Justin Bauer
882e08ced1
unixtools: fixup bad merge
...
This should hopefully fix the eval issue.
2018-05-08 15:37:10 -05:00
xeji
06ef2ec029
Merge pull request #40136 from sh4r3m4n/fzf-fix
...
fzf: fix vim plugin patch phase
2018-05-08 22:26:28 +02:00
xeji
ab4a04c38b
Merge pull request #40151 from yrashk/sit-aarch64-isel
...
sit: better fix for aarch64 bug
2018-05-08 22:09:25 +02:00
John Ericson
5bdfe37daf
Merge pull request #40154 from obsidiansystems/stdenv-arm-alias
...
stdenv: Put back isArm, with deprecation notice.
2018-05-08 14:24:58 -04:00
Peter Simons
6db7f92cc2
all-cabal-hashes: update to latest version
2018-05-08 17:48:12 +02:00
Peter Simons
c5338e5acb
haskell-gi: remember the URL to the PR that explains why the override is necessary
2018-05-08 17:47:12 +02:00
Peter Simons
26e961c1fb
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
7b40a148a0
.
2018-05-08 17:46:45 +02:00
Peter Simons
277ca33bee
LTS Haskell 11.8
2018-05-08 17:46:24 +02:00
Emmanuel Rosa
7936474efc
gnucash: restore version 2.4
2018-05-08 10:53:44 -04:00
Matthew Bauer
6748534d83
Merge remote-tracking branch 'upstream/master' into staging
2018-05-08 09:36:00 -05:00
John Ericson
f22bfb38c6
Merge pull request #40161 from ElvishJerricco/ghc-build-packages-integer-simple
...
Use build packages GHC for haskell.packages.integer-simple
2018-05-08 10:33:51 -04:00
Tim Steinbach
3510b983c4
linux: 4.17-rc3 -> 4.17-rc4
2018-05-08 10:02:05 -04:00
Nikolay Amiantov
61a87491dc
pacparser: init at 1.3.7
2018-05-08 16:27:55 +03:00
Nikolay Amiantov
d541169e1a
wesnoth: unite with wesnoth-dev
...
There's no Wesnoth development version now.
2018-05-08 16:06:30 +03:00
Ben Barclay
9ef306bb4d
bazel: 0.11.1 -> 0.12.0 ( #39585 )
2018-05-08 13:46:24 +01:00
Jörg Thalheim
9e968fb553
Merge pull request #40170 from tazjin/kontemplate-v1.5.0
...
kontemplate: 1.4.0 -> 1.5.0
2018-05-08 11:26:12 +01:00
Vincent Ambo
a604fc6fcb
kontemplate: 1.4.0 -> 1.5.0
...
Moves to release version 1.5.0 (released 2018-05-08).
2018-05-08 12:09:12 +02:00
Sarah Brofeldt
199e7f18ed
bluemix: Fix eval of maintainers
2018-05-08 11:53:33 +02:00
aszlig
dace481377
kdepim-addons: Add package expression
...
This is needed in order to add location information to contacts in
KAddressbook.
Packaging was quite straightforward except that it needed
akonadi-import-wizard, which I have packaged in the previous commit.
I'm committing this directly to master without a pull request, because
nothing depends on it (for obvious reasons) and packaging was trivial
enough so that if things are not as they supposed to be it can still be
changed very easily.
Tested this using the following VM configuration, because I don't run a
Plasma desktop:
(import <nixpkgs/nixos> {
configuration = { pkgs, ... }: {
environment.systemPackages = with import <nixpkgs> {}; [
kdeApplications.kaddressbook kdeApplications.kdepim-addons
];
users.users.test.isNormalUser = true;
virtualisation.diskSize = 4096;
virtualisation.memorySize = 2048;
services.xserver = {
enable = true;
inherit ((import <nixpkgs/nixos> {}).config.services.xserver) layout;
displayManager.sddm.enable = true;
displayManager.sddm.autoLogin.enable = true;
displayManager.sddm.autoLogin.user = "test";
desktopManager.default = "plasma5";
desktopManager.plasma5.enable = true;
};
};
}).vm
The test I've done is using KAddressbook and check whether the location
tab is working and it does now.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel, @vandenoever
2018-05-08 11:48:16 +02:00
aszlig
eb774f3047
akonadi-import-wizard: Add package expression
...
This is required for kdepim-addons and packaging this is pretty much
straightforward with no hurdles.
I tried to keep the coding style close to other packages in
kdeApplications so that it stays consistent.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel, @vandenoever
2018-05-08 11:48:12 +02:00
Jörg Thalheim
4dc33d06b9
Merge pull request #40056 from r-ryantm/auto-update/xmrig
...
xmrig: 2.5.3 -> 2.6.1
2018-05-08 10:08:04 +01:00
scalavision
aad0a825f9
singularity: 2.4.6 -> 2.5.1
2018-05-08 10:40:10 +02:00
Vincent Ambo
a8768c610e
bluemix-cli: init at 0.6.6 ( #40147 )
...
Adds the (non-free, binary) IBM Bluemix CLI which is required to
administrate IBM Bluemix services.
2018-05-08 09:22:25 +01:00