Commit Graph

12379 Commits

Author SHA1 Message Date
Vladimír Čunát
66fdb94f50
gawkInteractive: fix build after 04d4d14d6d
(Without causing a mass rebuild for now.)
2017-06-18 13:53:09 +02:00
Eric Sagnes
b9eecf80e7 tmuxinator: 0.8.1 -> 0.9.0 2017-06-18 20:45:51 +09:00
Vladimír Čunát
8702fd35e2
Merge branch 'master' into staging
... to get in more fixes of setuid/setgid.
2017-06-18 13:22:23 +02:00
Jörg Thalheim
91e08fe55b
vulnix: fix deps 2017-06-18 12:16:54 +01:00
Jörg Thalheim
ecc34cbdb3
glusterfs: do not set setuid in install
related to #26600
2017-06-18 11:57:23 +01:00
Jörg Thalheim
c25b145815
cli53: 0.4.4 -> 0.8.8 2017-06-18 11:25:41 +01:00
Pascal Wittmann
2fd359c978
rrdtool: 1.6.0 -> 1.7.0 2017-06-18 11:53:17 +02:00
Pascal Wittmann
b49689e6f7
parallel: 20170422 -> 20170522 2017-06-18 11:48:33 +02:00
Jörg Thalheim
3a15cdea6f
amazon-glacier-cmd-interface: fix missing argparse dep 2017-06-18 10:27:13 +01:00
Tim Steinbach
a81e1fc6ac Merge pull request #26641 from NeQuissimus/staging_curl_7_54_1
[staging] curl: 7.54.0 -> 7.54.1
2017-06-17 16:06:31 -04:00
Igor Sharonov
8506fc3653 languagetool: fix arguments passing 2017-06-17 20:42:51 +03:00
Vladimír Čunát
d88c0cf867
Merge #26628: treewide: setuid/setgid fallout 2017-06-17 13:23:39 +02:00
Jörg Thalheim
ca6bb9098c uucp: add remark to patch 2017-06-17 10:44:33 +01:00
Jörg Thalheim
cca6eb62c0 super: add remark to patch 2017-06-17 10:43:50 +01:00
Jörg Thalheim
9e2f08cdc2 sudo: add remark to patch 2017-06-17 10:42:55 +01:00
Jörg Thalheim
ae147e329f
logcheck: add remark to patch 2017-06-17 10:40:01 +01:00
Jörg Thalheim
67655caf37 cron: document patch 2017-06-17 10:37:21 +01:00
Piotr Bogdan
0d4431cfe9
fakeroot: apply patch to ignore EINVAL errors as well
Fixes #25901 the nixos.ova job.  See the referred links.
2017-06-17 11:36:39 +02:00
Vladimír Čunát
304391b2f2
Merge branch 'master' into staging
Another couple thousand rebuilds.
2017-06-17 09:58:34 +02:00
Will Dietz
5ff8387f64 sudo: fix attempt to set special perms 2017-06-16 16:20:06 -05:00
Bart Brouns
fc0a4a52f9 clipster: 2017-02-27 -> 1.0.1 2017-06-16 15:05:43 +02:00
Tim Steinbach
9560fcbadf
curl: 7.54.0 -> 7.54.1 2017-06-16 08:16:30 -04:00
Will Dietz
8098e4048b super: Don't set special perms, don't chown to root 2017-06-16 07:13:54 -05:00
Will Dietz
5d0a8792a7 uucp: Don't chown to 'uucp' user, don't set special perms 2017-06-16 07:11:02 -05:00
Vladimír Čunát
f714dfbb1d
Merge branch 'master' into staging
There have been quite significant rebuilds on master.
2017-06-16 14:07:29 +02:00
Will Dietz
4d57153659 logkeys: Don't chmod u+s 2017-06-16 06:57:05 -05:00
Will Dietz
714cd37b21 logcheck: Don't set special permissions 2017-06-16 06:57:00 -05:00
Will Dietz
3d5409ac97 cron: don't set special permissions 2017-06-16 06:56:56 -05:00
Will Dietz
0d92084f75 at: Don't set fancy bits on install 2017-06-16 06:56:51 -05:00
Alexey Shmalko
b521296a4c Merge pull request #26575 from rnhmjoj/ddcutil
ddcutil: init at 0.8.2
2017-06-16 10:08:55 +03:00
Franz Pletz
7272f8096e
nmap: 7.40 -> 7.50 2017-06-16 06:17:36 +02:00
Franz Pletz
4ac68216bd
unbound: 1.6.2 -> 1.6.3
Also moves the header file into the lib output.
2017-06-15 13:42:27 +02:00
Edward Tjörnhammar
3dcecf09fc
Remove aiccu package and service due to sunsetting.
https://www.sixxs.net/main/
2017-06-15 06:58:08 +02:00
rnhmjoj
7ef9a9ffc1
ddcutil: init at 0.8.2 2017-06-15 00:32:26 +02:00
Profpatsch
79dd4deda5 Ultrastar (#26524)
* ultrastardx-beta: init at 1.3.5

* libbass, libbass_fx: init at 24

* ultrastar-creator: init at 2017-04-12

* buildSupport/plugins.nix: add diffPlugins

Helper function to compare expected plugin lists to the found plugins.

* ultrastar-manager: init at 2017-05-24

The plugins are built in their own derivations, speeding up (re-)compilation.
The `diffPlugins` function from `beets` is reused to test for changes in the
plugin list on updates.

* beets: switch to diffPlugins

The function is basically just extracted for better reusability.
2017-06-14 11:29:31 +02:00
Maximilian Bosch
3803864ca6 thefuck: init at 3.18 (#26529) 2017-06-14 09:57:38 +01:00
Rok Garbas
cc0ce6b7a6
rofi-pass: 1.4.3 -> 1.5.0 2017-06-14 08:32:42 +02:00
Charles Strahan
3b1c4fce4f psensor: init at 1.2.0
psensor is a graphical hardware monitoring application for Linux
2017-06-13 18:51:36 -04:00
Bas van Dijk
2444eab485 ELK: update kibana and the elastic beats to 5.4 (#26252)
* Add kibana5 and logstash5
* Upgrade the elastic beats to 5.4
* Make sure all elastic products use the same version
  (see elk5Version)
* Add a test for the ELK stack
2017-06-13 22:36:08 +02:00
Peter Simons
424dc0138d parallel: fix broken shebangs to /usr/bin/perl
Adding perl to buildInputs accomplishes this for us automatically.
2017-06-13 22:28:58 +02:00
Daiderd Jordan
30412f9930
rhash: fix darwin build
Fixes cmake update to 3.8.2, d74d871f52
2017-06-13 22:09:12 +02:00
Robin Stumm
9079f94df7 exa: 2017-04-02 -> 0.6.0 2017-06-13 22:05:27 +02:00
Pascal Wittmann
50b3f8e051
fsql: 0.1.1 -> 0.2.1 2017-06-13 21:26:48 +02:00
Vladimír Čunát
90cf4cfabe
rhash: extend meta.platforms
Now cmake evaluates on Darwin again.  Let's be optimistic about building.
Discussion: https://github.com/NixOS/nixpkgs/commit/d74d871f52
2017-06-13 17:17:03 +02:00
Robin Gloster
04d4d14d6d
gawk: link gawk manpage to awk 2017-06-13 13:16:50 +02:00
Vladimír Čunát
ed070354a9
Merge branch 'staging' 2017-06-13 11:22:56 +02:00
Eelco Dolstra
0bffe03828
nix: 1.11.9 -> 1.11.10 2017-06-12 20:13:27 +02:00
Tuomas Tynkkynen
f1d8069ee8 file: 5.30 -> 5.31 2017-06-11 19:35:48 +03:00
Vladimír Čunát
32916ab1de
Merge older staging
Enough rebuilds have finished on Hydra now.
2017-06-11 09:01:08 +02:00
Tuomas Tynkkynen
149cb28312 Merge remote-tracking branch 'upstream/master' into staging 2017-06-11 04:47:30 +03:00
Tuomas Tynkkynen
1545229fa7 biosdevname: Broken on aarch64
Uses inline x86 asm:
https://nix-cache.s3.amazonaws.com/log/lqpnvr2xch5vv4zk2n0v4nlji8c88129-biosdevname-0.7.2.drv
2017-06-11 04:37:24 +03:00
Jörg Thalheim
86de155951 Merge pull request #26473 from romildo/upd.qt5ct
qt5ct: 0.32 -> 0.33
2017-06-10 22:47:29 +01:00
Bjørn Forsman
581226cfb4 nixos/bcache: /bin/sh -> ${bash}/bin/sh
Or else `services.udev.packages = [ bcache-tools ]` cannot be used.

To not break bcache in the initrd I'm modifying this in stage-1.nix:

  -  --replace /bin/sh ${extraUtils}/bin/sh
  +  --replace ${bash}/bin/sh ${extraUtils}/bin/sh

Reasoning behind that change:

* If not modifying the /bin/sh pattern in any way, it will also match
  ${bash}/bin/sh, creating a broken path like
  /nix/store/HASH-bash/nix/store/HASH-bash/bin/sh in the udev rule file.

* The addition of /bin/sh was done in 775f381a9e
  ("stage-1: add bcache support"). It seems somewhat plausible that
  no new users have appeared since then and we can take this opportunity
  to back out of this change without much fear of regressions.

  If there _are_ regressions, they should be in the form of build time
  errors, not runtime (boot), due to how the udev rule output is checked
  for invalid path references. So low risk, IMHO.

* An alternative approach could be to copy the /bin/sh substitute rule
  over to the non-initrd udev rules implementation in NixOS, but I think
  this way is better:
  - The rules file comes with a working path out of the box.
  - We can use more precise pattern matching when modifying the udev
    rules for the initrd.
2017-06-10 17:10:49 +02:00
Bjørn Forsman
f12b0a2179 bcache-tools: add name to the source store path
So that

 $ nix-build -A bcache-tools.src

gives

 /nix/store/HASH-bcache-tools-1.0.7.tar.gz

instead of

 /nix/store/HASH-v1.0.7.tar.gz
2017-06-10 17:10:49 +02:00
Jörg Thalheim
f723f7ceb4 Merge pull request #26423 from sjagoe/fix-grin-dependencies
grin: Fix build dependencies
2017-06-10 12:02:18 +01:00
Jörg Thalheim
fbe658eea0 Merge pull request #26296 from gnidorah/master3
autorandr: 855c18b -> 1.1
2017-06-10 11:00:53 +01:00
Jörg Thalheim
661ec1950d Merge pull request #26414 from volth/issue-25511
xdg_utils: fix #25511 (broken sed magic)
2017-06-10 10:30:45 +01:00
Vladimír Čunát
cb9f953c92
Merge branch 'master' into staging
More larger rebuilds.
2017-06-10 10:07:33 +02:00
Jörg Thalheim
a54eea6827 Merge pull request #26495 from makefu/pkgs/metasploit/update
metasploit: 4.14.17 -> 4.14.25
2017-06-09 22:39:07 +01:00
Jörg Thalheim
0cab4cac12
metasploit: add missing update deps to shell.nix 2017-06-09 22:20:28 +01:00
makefu
c1135333d1
metasploit: 4.14.17 -> 4.14.25 2017-06-09 23:09:22 +02:00
Jörg Thalheim
c0e14c084d
metasploit: add missing update deps to shell.nix 2017-06-09 21:45:24 +01:00
Daiderd Jordan
a6dc11e81e
tmux: fix hash, looks like the upstream tag was moved
--- a/configure.ac       1970-01-01 01:00:01.000000000 +0100
+++ b/configure.ac       1970-01-01 01:00:01.000000000 +0100
@@ -1,6 +1,6 @@
 # configure.ac

-AC_INIT(tmux, 2.5-rc)
+AC_INIT(tmux, 2.5)
 AC_PREREQ([2.60])

 AC_CONFIG_AUX_DIR(etc)
2017-06-09 19:54:39 +02:00
Tuomas Tynkkynen
2bfc977b6e ethtool: 4.10 -> 4.11 2017-06-09 01:58:23 +03:00
Joachim Fasting
8e706b051e
tor: 0.3.0.7 -> 0.3.0.8
Of particular note are fixes for hidden service crashing bugs
(TROVE-2017-004 and TROVE-2017-005).

See https://blog.torproject.org/blog/tor-0308-released-fix-hidden-services-also-are-02429-02514-02612-0278-02814-and-02911
2017-06-09 00:40:25 +02:00
Jörg Thalheim
211736fabf Merge pull request #26472 from romildo/upd.colordiff
colordiff: 1.0.16 -> 1.0.18
2017-06-08 21:25:06 +01:00
Tuomas Tynkkynen
69901f16c9 yle-dl: 2.15 -> 2.16 2017-06-08 23:13:06 +03:00
Tuomas Tynkkynen
cd46df3a1e fio: 2.19 -> 2.20 2017-06-08 23:13:06 +03:00
Tuomas Tynkkynen
399afc13e4 afl: 2.41b -> 2.42b 2017-06-08 23:13:06 +03:00
Vladimír Čunát
2993b7e096
Merge branch 'master' into staging
>10k of rebuilds from master
2017-06-08 20:56:22 +02:00
Vladimír Čunát
8b49936ad4
vboot_reference: fix evaluation after 1aac1fe5dd 2017-06-08 20:53:20 +02:00
romildo
146ac9c771 qt5ct: 0.32 -> 0.33 2017-06-08 15:07:12 -03:00
romildo
b5fc15610a colordiff: 1.0.16 -> 1.0.18 2017-06-08 14:57:22 -03:00
Jörg Thalheim
451de09f51
autorandr: fix python shebang 2017-06-08 12:11:43 +01:00
Yann Hodique
3ac67c1482 fzf: 0.16.7 -> 0.16.8 2017-06-07 17:53:20 -07:00
Michael Weiss
a7450098d4 maim: 3.4.47 -> 5.4.63 2017-06-08 01:51:34 +02:00
Michael Weiss
02aa3264f5 slop: 4.1.16 -> 6.3.41 2017-06-08 01:50:40 +02:00
Vladimír Čunát
ae6df000d0
Merge branch 'master' into staging 2017-06-07 18:11:27 +02:00
Linus Heckemann
3c3a25acc5 jing-trang: use jre_headless
This halves its closure size.
2017-06-07 15:18:41 +02:00
Simon Jagoe
0218408846 grin: Use fetchFromGitHub instead of fetchgit 2017-06-07 14:22:52 +03:00
gnidorah
5c9f0d00c3 autorandr: 855c18b -> 1.1 2017-06-07 13:23:36 +03:00
Vladimír Čunát
445b107d93
openssh: fixup build on Hydra
http://hydra.nixos.org/build/53993444
2017-06-07 09:33:56 +02:00
Yann Hodique
ac0fc387b2 silver-searcher: 1.0.2 -> 2.0.0 2017-06-07 06:26:51 +02:00
Eelco Dolstra
3d4a8e1f84 nixUnstable: 1.12pre5350_7689181e -> 1.12pre5413_b4b1f452 2017-06-06 15:06:42 +02:00
Simon Jagoe
314da48f31 grin: Fix build dependencies
Using old source, grin was unable to build due to missing argparse pypi
package.
2017-06-06 15:14:17 +03:00
Volth
d2f453bc0d fix #25511 2017-06-05 23:37:53 +00:00
Jörg Thalheim
dffec16abd Merge pull request #26410 from kierdavis/hooks
Fix hooks not being called when overriding phases in various packages
2017-06-05 22:23:01 +01:00
Marius Bergmann
766cbda1f3 journalbeat: 5.1.2 -> 5.4.1 2017-06-05 23:15:44 +02:00
Antoine Eiche
a4b8c214be cloud-init: remove argparse from requirements.txt
Argparse is part of python stdlib.
2017-06-05 21:44:05 +02:00
Kier Davis
b81124b4fb
Fix hooks not being called when overriding phases in various packages
It's necessary to do this in order to fix ckb's compilation, now that
fixupPhase rejects derivation results containing references to the temporary
build directory. It seems like good practice so I've added it to the
other packages that I maintain.
2017-06-05 19:13:19 +01:00
Peter Hoeg
5b747cc7c4 paperkey: 1.3 -> 1.4 2017-06-05 15:42:16 +08:00
Vincent Laporte
68eb2c2379 ocamlPackages.re2: mark broken on darwin 2017-06-05 05:45:59 +00:00
Pascal Wittmann
f39a047dac
yara: 3.5.0 > 3.6.0, fixes CVE-2017-5924 2017-06-04 17:48:25 +02:00
Jörg Thalheim
4c034921c3 Merge pull request #26311 from rnhmjoj/colorama
update colorama and related
2017-06-03 13:08:24 +01:00
Jörg Thalheim
c0f2e13bee Merge pull request #26239 from jensbin/networkmanager-dmenu_20170528
networkmanager_dmenu: unstable-2017-04-13 -> unstable-2017-05-28
2017-06-03 13:07:06 +01:00
Jörg Thalheim
88164c77e8 Merge pull request #26235 from apeyroux/init-ctop
ctop: init at 2017-05-28
2017-06-03 12:37:39 +01:00
Mateusz Kowalczyk
dcf171bc79 Revert "dd-agent: 5.11.2 -> 5.13.2 + service rework"
This reverts commit af096c8bff.
2017-06-03 12:27:56 +01:00
Mateusz Kowalczyk
668556331b Revert "datadog: Properly use configured package."
This reverts commit 50f53da9ef.
2017-06-03 12:27:43 +01:00
Robert Helgesson
4576e8dddd
trash-cli: fix build on Python 3.6 2017-06-03 00:37:48 +02:00
Lorenzo Manacorda
4a62364c17 youtube-dl: 2017.05.23 -> 2017.05.29 (#26329)
* youtube-dl: add pycryptodome dependency

The pycrypto library is used for HLS streams with encrypted segments.

See https://github.com/rg3/youtube-dl/pull/8201

* youtube-dl: 2017.05.23 -> 2017.05.29
2017-06-02 21:40:17 +01:00
Thomas Tuegel
b0da92ddf2 Merge pull request #26120 from romildo/upd.qt5ct
qt5ct: 0.30 -> 0.32
2017-06-02 09:05:44 -05:00
Bas van Dijk
e367d69fcc strongswan: 5.5.2 -> 5.5.3 2017-06-02 13:53:45 +02:00
rnhmjoj
805ee69aa3
tmuxp: 1.2.7 -> 1.3.1 2017-06-02 11:58:37 +02:00
Frederik Rietdijk
1fe17ee116 Merge pull request #26316 from rnhmjoj/pirate-get
pirate-get: 0.2.9 -> 0.2.10
2017-06-02 09:37:07 +02:00
Mateusz Kowalczyk
50f53da9ef datadog: Properly use configured package. 2017-06-02 08:16:47 +01:00
Edward Tjörnhammar
01ef91aa04
i2pd: 2.13.0 -> 2.14.0 2017-06-02 06:31:39 +02:00
rnhmjoj
ceedd0b04a
pirate-get: 0.2.9 -> 0.2.10 2017-06-02 00:36:59 +02:00
Frederik Rietdijk
87ee5896fb Merge pull request #25709 from nh2/25620-glusterfs-fix-python-import-errors
Fix: GlusterFS python tools all have import errors
2017-06-01 22:06:21 +02:00
Pascal Wittmann
08228e8bfa
nagstamon: init at 2.0.1 2017-06-01 19:32:06 +02:00
Marius Bergmann
41efae4500 restic: 0.6.0 -> 0.6.1 2017-06-01 17:41:56 +02:00
Mateusz Kowalczyk
af096c8bff dd-agent: 5.11.2 -> 5.13.2 + service rework 2017-06-01 15:08:50 +01:00
Nikolay Amiantov
530ababdf6 blueman: wrap binaries in libexec
Fixup after c10af9e744
2017-06-01 14:30:40 +03:00
Peter Hoeg
ef77b61f75 kwalletcli: init at 3.00 2017-06-01 19:11:30 +08:00
Jörg Thalheim
d7f6367471
daemontools: fix build 2017-05-31 23:57:15 +01:00
Michael Weiss
047a5a18df pgpdump: 0.31 -> 0.32 2017-05-31 16:42:51 +02:00
Daiderd Jordan
3c0114d472
sudo: 1.8.20 -> 1.8.20p1, fixes CVE-2017-1000367 2017-05-30 23:33:04 +02:00
Théo Zimmermann
f8fd5531a3 patdiff: init at 0.9.0 2017-05-30 20:50:36 +02:00
Edward Tjörnhammar
53835c93cb
i2pd: homepage update 2017-05-30 16:49:21 +02:00
Edward Tjörnhammar
1e51fdc2cd
i2pd: disable AVX instructions 2017-05-30 16:49:20 +02:00
Vladimír Čunát
538aa0f808
Merge branch 'staging' (early part)
The comparison looks nice on Hydra.
2017-05-30 16:08:21 +02:00
Jens Binkert
479ddf0f13 networkmanager_dmenu: unstable-2017-04-13 -> unstable-2017-05-28 2017-05-30 15:50:10 +02:00
Alexandre Peyroux
31d5363228
ctop: init at 2017-05-28 2017-05-30 13:10:45 +02:00
Frederik Rietdijk
ccafbacd8f Merge pull request #26215 from dermetfan/mcrcon
mcrcon: init at 0.0.5
2017-05-30 09:03:47 +02:00
Vincent Laporte
a987943fdf ditaa: more general platform 2017-05-30 06:55:46 +00:00
Frederik Rietdijk
89a32f4586 Merge pull request #26124 from womfoo/init/cloudmonkey-5.3.3
cloudmonkey: init at 5.3.3 with related dependency argcomplete: init at 1.8.2
2017-05-30 08:43:05 +02:00
Marius Bergmann
a49eb2f3b8 restic: 0.5.0 -> 0.6.0 2017-05-29 23:58:59 +02:00
Robin Stumm
75a94a5a28 mcrcon: init at 0.0.5 2017-05-29 22:46:23 +02:00
Kranium Gikos Mendoza
4126cc18be cloudmonkey: init at 5.3.3 2017-05-30 06:37:19 +10:00
Matthias Beyer
97eddf0907 vimer: init at 0.2.0 2017-05-29 23:02:11 +03:00
Frederik Rietdijk
3d2cfabad6 hdf5: add comment about multiple outputs 2017-05-29 21:25:42 +02:00
timor
1d56c2fa43 NetworkManager: fix openconnect for console tools
This patch allows `nmcli` and `nmtui to work correctly with
openconnect.  This is dony by hard-coding the openconnect binary location.

see #25915
2017-05-29 17:24:22 +01:00
Pascal Wittmann
c63339567b imapsync: 1.684 -> 1.727 2017-05-29 12:19:29 +02:00
Vladimír Čunát
02032dbda4
Merge branch 'master' into staging
More mass rebuilds from master.
2017-05-29 10:51:38 +02:00
Pascal Wittmann
dc955ad2d7 halibut: 1.1 -> 1.2 2017-05-29 09:58:10 +02:00
Pascal Wittmann
9b605ca041 fsql: 0.1.0 -> 0.1.1 2017-05-29 09:52:59 +02:00
Pascal Wittmann
8e507cfdfe Merge pull request #26183 from womfoo/bump/pick-1.6.1
pick: 1.4.0 -> 1.6.1
2017-05-28 20:24:05 +02:00
Jörg Thalheim
ce61c20742 Merge pull request #26189 from mbrgm/cfssl
cfssl: init at 20170527
2017-05-28 19:22:54 +01:00
Pascal Wittmann
aee5fa2f48
moreutils: 0.59 -> 0.61 2017-05-28 20:00:07 +02:00
Marius Bergmann
6ecb92a3c3 cfssl: init at 20170527 2017-05-28 18:43:04 +02:00
Kranium Gikos Mendoza
a3bc7ec0f0 pick: 1.4.0 -> 1.6.1 2017-05-29 00:21:25 +10:00
Samuel Dionne-Riel
1f89ba117c ibus-m17n: fix homepage URL.
The URL was erroneous.
2017-05-27 22:39:16 -04:00
Jörg Thalheim
801adf99c2 Merge pull request #26158 from montag451/simpleproxy
simpleproxy: init at 3.5
2017-05-27 18:54:19 +01:00
montag451
6de69a2425 simpleproxy: init at 3.5 2017-05-27 17:42:48 +02:00
Frederik Rietdijk
77b7fca588 Merge remote-tracking branch 'upstream/master' into HEAD 2017-05-27 14:28:05 +02:00
romildo
27aaea0cd2 qt5ct: 0.30 -> 0.32 2017-05-27 07:50:24 -03:00
Pascal Wittmann
f717118610
fsql: init at 0.1.0 2017-05-27 11:50:47 +02:00
Vladimír Čunát
76a020e676
Merge branch 'master' into staging 2017-05-27 11:11:44 +02:00
montag451
ffe4e82dd3 nss-pam-ldapd: 0.8.13 -> 0.9.7 2017-05-27 02:53:22 +02:00
Franz Pletz
8ab0501865 Merge pull request #25565 from KaiHa/nitrokey-app-1.0
nitrokey-app: 0.6.3 -> 1.1
2017-05-27 02:43:22 +02:00
Vladimír Čunát
00672dec8a
Merge older staging
This still causes some uncached rebuilds, but master(!) and staging
move too fast forward rebuild-wise, so Hydra might never catch up.
(There are also other occasional problems.)
Therefore I merge at this point where the rebuild isn't that bad.
2017-05-26 15:45:43 +02:00