Vladimír Čunát
2090aa4f65
Merge: fixup a bad merge
...
For details see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 19:11:17 +02:00
Vladimír Čunát
6617c8bd87
A fixed version of commit eb750f9a7b
...
For detailed explanation see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 18:59:36 +02:00
Armijn Hemel
b6f88093a2
icoutils: update to 0.31.3
2017-04-14 17:21:54 +02:00
Tristan Helmich
c395568b7a
openssh_hpn: use new sources and version (7_5_P1)
...
Close #23990 .
2017-04-14 12:22:15 +02:00
Vladimír Čunát
5b3f807597
Merge #24179 : openssh: 7.4p1 -> 7.5p1
2017-04-14 12:16:26 +02:00
Vladimír Čunát
24444513fb
Merge branch 'staging'
2017-04-14 10:32:13 +02:00
Daiderd Jordan
4a913ecfd3
Merge pull request #24797 from nixy/pass/coreutils-sb-patch
...
pass: fix clipboard functionality for darwin
2017-04-13 19:26:50 +02:00
Jörg Thalheim
73c8797d16
gce/create-gce.sh: rewrite using nix-shell shebang and bash ( #24869 )
...
* google-cloud-sdk: 150.0.0 -> 151.0.0
- gce/create-gce.sh: rewrite using nix-shell shebang and bash
- allows to run the script without being the same directory
- nix-shell install google-cloud-sdk
- some shellcheck cleanups and scripting best practice
- gce/create-gce.sh: do not clobber NIX_PATH: this allows NIX_PATH to be overwritten to build a different release
- gce/create-gce.sh: remove legacy hydra option
2017-04-13 13:42:28 +02:00
Daniel Peebles
f21a6940da
Merge pull request #24838 from matthewbauer/ibtool
...
pinentry_mac: use xcbuild
2017-04-12 22:20:57 -04:00
Matthew Bauer
4672fe6998
pinentry_mac: use precompiled .nib's
...
sadly, xib2nib hasn't been working like i though. I've just
precompiled into our modified pinentry_mac. Eventually we can get this
fixed but it's not as easy as first thought.
2017-04-12 20:03:29 -05:00
Daiderd Jordan
eb750f9a7b
Merge branch 'master' into staging
2017-04-12 21:34:36 +02:00
Daiderd Jordan
ce4c9c4d86
Merge pull request #24826 from kirelagin/bonniepp
...
bonnie: Update Darwin patch
2017-04-12 19:51:09 +02:00
Matthew Bauer
457570f61a
pinentry_mac: switch to pure version
...
Fixes #24734
2017-04-12 02:59:54 -05:00
Tuomas Tynkkynen
0d86c0692f
gawk: Disable tests that don't work in sandbox
2017-04-11 23:37:31 +03:00
Tuomas Tynkkynen
1e1b68b4a0
patchutils: Drop patch applied upstream
2017-04-11 23:13:28 +03:00
Eelco Dolstra
29b415dcdb
Add nixUnstable.perl-bindings
2017-04-11 15:36:51 +02:00
Kirill Elagin
4f61dd7581
bonnie: Update Darwin patch
2017-04-11 16:23:10 +03:00
Eelco Dolstra
3dd66ec6e9
nix: 1.12pre5122_c60715e -> 1.12pre152_915f62fa
2017-04-11 15:02:45 +02:00
Tuomas Tynkkynen
d550c90712
patchutils: 0.3.3 -> 0.3.4
2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen
6b84ee9f96
lzma: 5.2.2 -> 5.2.3
2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen
c7e1a25765
gawk: 4.1.3 -> 4.1.4
2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen
52797fc600
Merge remote-tracking branch 'upstream/master' into staging
2017-04-11 12:58:43 +03:00
Tuomas Tynkkynen
b002d6a868
Revert "btrfs-progs: 4.8.2 -> 4.10.2"
...
This reverts commit c0cef0425e
.
The output of the command-line tool has changed somewhat and at least
nixos-generate-config.pl needs modifications to match. I'm leaving that
to someone who knows a bit more about btrfs.
Issue #24810 .
2017-04-11 09:54:43 +03:00
Jörg Thalheim
e09b950f54
openvpn: remove no longer correct systemd-notify.patch
...
This patch was only necessary for 2.3.x, while 2.4.0 improved
its own systemd notify support.
See: https://github.com/NixOS/nixpkgs/issues/24817
2017-04-11 08:51:56 +02:00
Tuomas Tynkkynen
9ae8ce813e
dosfstools: Use --enable-compat-symlinks
...
http://hydra.nixos.org/build/51461475
2017-04-11 09:37:45 +03:00
Dan Peebles
0b034797e1
bonnie: fix on Darwin
2017-04-10 23:08:14 -04:00
Aneesh Agrawal
769b991be6
openssh: 7.4p1 -> 7.5p1
...
Release notes are available at https://www.openssh.com/txt/release-7.5 .
Mostly a bugfix release, no major backwards-incompatible changes.
Remove deprecated `UsePrivilegeSeparation` option,
which is now mandatory.
2017-04-10 19:39:22 -04:00
Andrew R. M
785f6ce5d6
pass: Fix clipboard functionality
...
Add the patch that was removed that allows pass's clip() function to
work with single binary coreutils. This version of the patch is also
applied to darwin.sh, so this should fix the clipboard functionality in
darwin as well.
2017-04-10 10:31:00 -04:00
Tuomas Tynkkynen
c0cef0425e
btrfs-progs: 4.8.2 -> 4.10.2
2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen
199be99c6f
dosfstools: 3.0.28 -> 4.1
2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen
183279002d
f2fs-tools: 1.7.0 -> 1.8.0
2017-04-10 17:09:22 +03:00
Tuomas Tynkkynen
c334daa5c2
f2fs-tools: Cleanup a bit
2017-04-10 17:09:22 +03:00
Daiderd Jordan
f8230518a2
Merge pull request #24762 from matthewbauer/darwin-misc-fixes
...
darwin: miscellaneous fixes
2017-04-10 08:50:15 +02:00
Yann Hodique
f4ff67099b
keychain: add sigma as maintainer
2017-04-09 22:28:27 -07:00
Tuomas Tynkkynen
b64163a90d
bonnie: 1.97 -> 1.97.3
2017-04-10 01:16:39 +03:00
Tuomas Tynkkynen
1b94c30beb
fio: 2.17 -> 2.19
2017-04-09 22:34:19 +03:00
Tuomas Tynkkynen
d284082b9f
yle-dl: 2.11 -> 2.15
2017-04-09 22:17:16 +03:00
Tuomas Tynkkynen
aef593fcbf
picocom: 2.1 -> 2.2
2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen
1f625ce93e
ntfs3g: 2016.2.22 -> 2017.3.23
2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen
64306e29d7
less: 481 -> 487
2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen
997b77cd38
iperf: 3.1.3 -> 3.1.7
2017-04-09 21:48:25 +03:00
Aristid Breitkreuz
faa5d22231
Merge pull request #24771 from sigma/pr/keychain
...
keychain: 2.8.0 -> 2.8.3
2017-04-09 20:26:19 +02:00
Yann Hodique
c51625b058
keychain: 2.8.0 -> 2.8.3
2017-04-09 09:17:32 -07:00
Michael Raskin
ba7a1b6505
Merge pull request #24520 from asppsa/octave-hg
...
Add Octave HG version, use with purePackages.octave
2017-04-09 15:23:51 +02:00
Peter Simons
4e307b644a
Merge pull request #24760 from matthewbauer/linux-only-pkgs
...
Mark linux-only pkgs
2017-04-09 14:18:10 +02:00
Matthew Bauer
38fa991064
pinentry_mac: use xcbuild
2017-04-09 04:24:16 -05:00
Matthew Bauer
d8b98c4f77
safecopy: linux only
2017-04-09 01:29:52 -05:00
Matthew Bauer
1df7966d9d
scanmem: linux only
2017-04-09 01:29:41 -05:00
Alastair Pharo
f0ebcc6444
epstool: add package
2017-04-09 14:35:06 +10:00
Matthew Bauer
c02ab895a1
hwinfo: make linux-only
2017-04-08 23:34:54 -05:00