Commit graph

11838 commits

Author SHA1 Message Date
Frederik Rietdijk e0abe74baf Merge remote-tracking branch 'upstream/master' into HEAD 2017-04-18 11:25:43 +02:00
John Ericson 37e5e71fdf Merge pull request #24974 from Ericson2314/mapNullable
Introduce `mapNullable` into lib and use it in a few places
2017-04-17 17:12:14 -04:00
John Ericson 85aa5005af Introduce mapNullable into lib and use it in a few places
Also simply some configure flag logic my grep also alerted me too.
2017-04-17 17:04:04 -04:00
Chris Hodapp 228f33b21d osm2pgsql: init at 0.92.1-unstable 2017-04-17 16:19:41 -04:00
Daniel Peebles e9f1d8693a Merge pull request #23026 from copumpkin/nixos-install-wip
Refactor nixos-install to separate out filesystem build logic
2017-04-17 09:50:35 -04:00
Joachim Fasting c2130eca44
logcheck: point homepage to alioth.debian.org
The page at logcheck dot org contains questionable links and it is unclear
whether it is controlled by the logcheck project at all.  Fix by using the
homepage debian points to instead.

Fixes https://github.com/NixOS/nixpkgs/issues/24952
2017-04-16 20:52:14 +02:00
Jörg Thalheim 769de5629c Merge pull request #24932 from jb55/add/cargo-edit
cargo-edit: init at 0.1.6
2017-04-16 20:51:44 +02:00
Dan Peebles d990aa7163 Refactor nixos-install to separate out filesystem build logic
The key distinction I'm drawing is that there's a component that deals
with the store of the machine being built, and another component for
the store building it. The inner part of it assumes nothing from the
builder (doesn't need chroot or root powers) so it can run comfortably
inside a Nix build, as well as nixos-rebuild. I have some upcoming work
that will use that to significantly speed up and streamline image builds
for NixOS, especially on virtualized hosts like EC2, but it's also a
reasonable speedup on native hosts.
2017-04-16 16:09:41 +00:00
Joachim F 901a0bb9fa Merge pull request #24908 from adamruzicka/cjdns-v19.1
cjdns: 18 -> 19.1
2017-04-16 12:10:59 +01:00
Michael Raskin ba7151e2b5 clac: add missing expression body; thanks @joachifm for the catch 2017-04-16 12:02:35 +02:00
Nikolay Amiantov 3507da085f dropbear: fix static build
Fixes #24839. Also change default sftp-server path to a more canonical.
2017-04-16 12:58:27 +03:00
Vladimír Čunát 9ee2143912
treewide: remove unused buildEnv parameters 2017-04-16 10:29:49 +02:00
sternenseemann 5b065a5ba5 glyr: init at 1.0.10 2017-04-15 18:40:23 +02:00
William Casarin 209e8e53fb cargo-edit: init at 0.1.6 2017-04-15 09:17:21 -07:00
Jörg Thalheim d5afba485b
rpm: fix rpmquery/rpmverify symlinks 2017-04-15 10:24:16 +02:00
armijnhemel fed7d4a6e9 RPM: 4.13.0-rc1 -> 4.13.0.1 (#24910) 2017-04-15 10:18:04 +02:00
Jörg Thalheim 4a0be7837c Merge pull request #24917 from sigma/pr/fzf
fzf: 0.16.4 -> 0.16.6
2017-04-15 09:41:53 +02:00
Michael Raskin 3368583e32 Merge pull request #24918 from sigma/pr/lftp
lftp: 4.7.6 -> 4.7.7
2017-04-15 08:15:25 +02:00
John Ericson 3bff114d95 Merge pull request #24871 from elitak/cross-staging
Various small crossDrv fixes
2017-04-15 01:27:05 -04:00
Yann Hodique 7a8ef9c6bd lftp: 4.7.6 -> 4.7.7 2017-04-14 21:43:24 -07:00
Yann Hodique e0ed784c06 fzf: 0.16.4 -> 0.16.6 2017-04-14 21:38:31 -07:00
Benjamin Staffin 8d07a8b381 Merge pull request #24883 from lucas8/fanficfare
fanficfare: init at 2.9.0
2017-04-14 19:08:16 -04:00
Benjamin Staffin 4d2bc435f9 Merge pull request #24906 from ndowens/speedtest
speedtest-cli: 1.0.3 > 1.0.4
2017-04-14 19:02:45 -04:00
Benjamin Staffin aeebfd9daa Merge pull request #24903 from pjones/pjones/atomicparsely
atomicparsley: 0.9.0 -> 0.9.6
2017-04-14 19:02:05 -04:00
ndowens 896432e4ac speedtest-cli: 1.0.3 > 1.0.4 2017-04-14 15:50:53 -05:00
Kai 91d2dc00bb nitrokey-app: 0.5.1 -> 0.6.3 (#24219)
* nitrokey-app: 0.5.1 -> 0.6.3

* Fix (native)buildInputs and refactor
2017-04-14 15:34:36 -05:00
Adam Ruzicka 21efba54ca cjdns: 18 -> 19.1 2017-04-14 22:09:20 +02:00
Peter Jones 3f69d10342
atomicparsley: 0.9.0 -> 0.9.6 2017-04-14 12:10:28 -07:00
Vladimír Čunát f7a4f146c9
Merge branch 'master' into staging
This includes a fix for a bad merge.
2017-04-14 19:22:02 +02:00
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
Vladimír Čunát aeb0560959
Merge #24858: Smart wrapProgram 2017-04-14 12:24:33 +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
Eric Litak 980ced505f coreutils: fixing ccCross.libc lookup 2017-04-14 02:00:08 -07:00
Eric Litak 6b73c0f198 netcat-openbsd: pkgconfig is a nativeBuildInput 2017-04-14 01:59:28 -07:00
Vladimír Čunát 24444513fb
Merge branch 'staging' 2017-04-14 10:32:13 +02:00
lucas8 9d79418019 fanficfare: init at 2.9.0 2017-04-13 23:05:45 +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
Nikolay Amiantov 60e0130ea1 blueman: use wrapGAppsHook 2017-04-12 18:12:23 +03: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