Commit graph

115541 commits

Author SHA1 Message Date
John Ericson a31365d831 Revert "Merge commit on master into staging"
This was reverted on master in
3510197dcc, and so needs to be reverted
here too.

This reverts commit 3befba542a, reversing
changes made to 3655e7e18b.
2017-09-15 13:01:12 -04:00
John Ericson fd988f8481 Merge another master commit into staging
Again, this is for sake of chained PRs having readable diffs
2017-09-15 12:38:26 -04:00
John Ericson 3befba542a Merge commit on master into staging
Doing this surgically so a future PR has a readable diff.
2017-09-15 12:13:09 -04:00
John Ericson e92cda161a haskell infra: Fix cross as much as possible without changing hashes 2017-09-15 11:37:39 -04:00
John Ericson 63bf7d002c ghc: Clean up, and add passthru.prefix, in preparation for cross
No hashes should be changed.
2017-09-15 11:37:39 -04:00
John Ericson 81680d44c8 linux-headers 4.4: Remove arch fallback code
@dezgeg was right: The `platform` field of a linux platorm is already
manadatory---if not specified it is inferred, and all such inferences
include a `kernelArch` field. Therefore linux packages can indeed rely
on it being defined.
2017-09-14 19:30:20 -04:00
John Ericson fb5d7b218d linux-headers: Remove dead old version
This sat around unused for who knows how long
2017-09-14 19:30:16 -04:00
John Ericson 3655e7e18b Merge commit 'bf7b5215001ca5adb283dfd68facc914fce96c49' into staging
This is part of master
2017-09-14 18:52:01 -04:00
John Ericson bf7b521500 treewide: Fix some references to binutils
- Compiler's shouldn't use `binutils.dev` as that doesn't yet exist
   with a cross binutils.

 - Last two `binutils.binutils` which weren't reverted
2017-09-14 18:12:54 -04:00
John Ericson 1055c43200 yabar: pkg-config should be a native build input 2017-09-14 13:40:24 -04:00
John Ericson 12452178e8 Merge pull request #29381 from obsidiansystems/autoreconf-hook
autoreconfHook: Simplify by avoiding `findInputs`
2017-09-14 13:16:53 -04:00
John Ericson d242978671 autoreconfHook: Simplify by avoiding findInputs
`findInputs` is a stdenv/setup helper we should strive not to call
elsewhere. Using normal deps is more idiomatic anyways.
2017-09-14 13:16:12 -04:00
John Ericson d94c7f5d3b Merge pull request #29349 from Ericson2314/harden-bootstrap
treewide: Do not limit hardenging because gcc 4.9 in bootstrap
2017-09-14 10:31:08 -04:00
John Ericson e5567bae2d treewide: Do not limit hardenging because gcc 4.9 in bootstrap
Bootstrap tools has since been bumped
2017-09-14 10:27:13 -04:00
Jörg Thalheim 392a014ff2 Merge pull request #29272 from Mic92/kerberos
kerberos: store state in /var/lib instead of $out/var
2017-09-13 23:24:26 +01:00
Tuomas Tynkkynen 41458f74a4 Merge remote-tracking branch 'upstream/master' into staging 2017-09-13 22:59:04 +03:00
Robin Gloster f5e0e94b2a
nixos/redmine: fix create role
postgresql create role no longer supports NOCREATEUSER option. See
https://www.postgresql.org/docs/9.6/static/release-9-6.html for
details.
2017-09-13 21:55:50 +02:00
Matthias Beyer b0237f767e bean-add: 2017-04-16 -> 2017-09-13 2017-09-13 21:53:56 +02:00
Matthias Beyer 8c1403066c rtv: 1.15.1 -> 1.18.0
Disable tests, which try to access the network.
2017-09-13 21:53:55 +02:00
Matthias Beyer 495dbc2cc2 mdp: 1.0.9 -> 1.0.10 2017-09-13 21:44:49 +02:00
Matthias Beyer 30a1e189ac ctodo: 1.2 -> 1.3 2017-09-13 21:44:49 +02:00
Matthias Beyer 678c149e53 buku: 3.0 -> 3.3.1 2017-09-13 21:44:49 +02:00
Matthias Beyer 65b91cd23b sqlitebrowser: 3.9.1 -> 3.10.0 2017-09-13 21:44:49 +02:00
Matthias Beyer 56cf561581 toot: 0.13.0 -> 0.15.0 2017-09-13 21:44:49 +02:00
Joachim F c9200f8d9c Merge pull request #28874 from ryantm/mattermost
nixos/mattermost: fix create role
2017-09-13 19:41:25 +00:00
Joachim F 161b8a2bc8 Merge pull request #29035 from ryantm/update_mattermost
mattermost: 3.8.2 -> 4.1.0
2017-09-13 19:41:10 +00:00
Gabriel Adomnicai 49eb1664d8 meteor: 1.4.2.3 -> 1.5 (#28905) 2017-09-13 19:35:36 +00:00
Domen Kožar 4ffa9ace43
Add atom-beta 2017-09-13 21:08:32 +02:00
Joachim F d1f0affe33 Merge pull request #28869 from symphorien/bombono
bombono: init at 1.2.4
2017-09-13 18:46:13 +00:00
Vincent Laporte cc5491d02c proverif: 1.95 -> 1.97pl1 2017-09-13 20:01:55 +02:00
Profpatsch 4cbe7bda70 Remove Profpatsch from the CODEOWNERS file
Since CODEOWNERS shall be interpreted as actual ownership (and not just a
mentionbot replacement), I will remove myself again.
2017-09-13 19:56:13 +02:00
Andreas Rammhold f47ab6c2fe afewmail: update meta.homepage (#29313) 2017-09-13 17:42:40 +00:00
Jörg Thalheim 13edd9765a Merge pull request #29125 from geistesk/firehol-3.1.4
firehol: init at 3.1.4, iprange: init at 1.0.3
2017-09-13 18:10:22 +01:00
Thomas Tuegel 787c6ff3e1 Merge pull request #29321 from NixOS/revert-29277-kde_frameworks_5_38
Revert "kdeFrameworks: 5.37 -> 5.38"
2017-09-13 11:58:45 -05:00
Thomas Tuegel e468ef5119 Revert "kdeFrameworks: 5.37 -> 5.38" 2017-09-13 11:57:15 -05:00
Joachim Fasting aff74b6af7
socklog: fixup implicit function declarations 2017-09-13 18:27:15 +02:00
Joachim Fasting 705f47f50e
socklog: properly disable the chkshsgr test
My previous attempt d438cbb0b6 was
bogus ...
2017-09-13 18:27:09 +02:00
Joachim F 2a329d4c18 Merge pull request #29314 from mdorman/emacs-updates
Semi-automated Emacs package updates
2017-09-13 16:25:55 +00:00
Joachim F 34b4935850 Merge pull request #29288 from florianjacob/piwik-3.1.0
piwik: 3.0.4 -> 3.1.0
2017-09-13 16:25:45 +00:00
Joachim F 35f38bfc46 Merge pull request #29308 from taku0/flashplayer-27.0.0.130
flashplayer: 26.0.0.151 -> 27.0.0.130 [Critical security fixes]
2017-09-13 16:25:13 +00:00
Frederik Rietdijk 4871946c63 Merge pull request #29310 from Infinisil/s-tui
s-tui: init at 0.6.0
2017-09-13 17:51:52 +02:00
Silvan Mosberger 753d114b34
s-tui: init at 0.6.0 2017-09-13 17:48:56 +02:00
Frederik Rietdijk 720e88b337 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-13 17:39:40 +02:00
Bjørn Forsman 67c70aa581 OVMF: add 'src' attribute
No functional change, but allows getting the source via the standard
attribute: `nix-build -A OVMF.src`.
2017-09-13 17:30:28 +02:00
John Ericson 8fccaa284d Merge pull request #29282 from obsidiansystems/soext
lib, treewide: Add `*Platform.extensions` and use it where possible
2017-09-13 11:20:06 -04:00
John Ericson 5aec3f96a2 treewide: Use *Platform.extensions 2017-09-13 11:16:10 -04:00
John Ericson 741839a687 lib: Add *Platform.extensions
This is used to platform specific library and exectuable extensions. In
the next commit I'll replace a bunch of ad-hoc logic with it.
2017-09-13 11:07:50 -04:00
Tuomas Tynkkynen 98d84b1375 diffoscope: Update tool list 2017-09-13 17:56:07 +03:00
Tuomas Tynkkynen ab5bd5e596 diffoscope: Remove obsolete and unreferenced patch 2017-09-13 17:56:07 +03:00
Tuomas Tynkkynen 890d4a2853 diffoscope: Revive hard links patch 2017-09-13 17:56:07 +03:00