3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

12235 commits

Author SHA1 Message Date
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
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