Commit graph

127522 commits

Author SHA1 Message Date
Tuomas Tynkkynen
4c6c919a31 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/os-specific/linux/kernel/generic.nix
2018-02-07 03:41:24 +02:00
adisbladis
fc1224d55d
Merge pull request #33743 from fuzzy-id/cassandra-bump
cassandra: version bump 2.1.15->2.1.19, 2.2.9->2.2.11, 3.0.9->3.0.15
2018-02-07 09:17:32 +08:00
adisbladis
5582365d3e
Merge pull request #34664 from ryantm/autoconf-archive
autoconf-archive: 2017.03.21 -> 2017.09.28
2018-02-07 09:13:46 +08:00
Thomas Bach
30c71376c9
cassandra: 3.0.9 -> 3.0.15 2018-02-07 09:09:04 +08:00
Thomas Bach
798c6cdaca
cassandra: 2.2.9 -> 2.2.11 2018-02-07 09:08:41 +08:00
Thomas Bach
a9264dbeab
cassandra: 2.1.15 -> 2.1.19 2018-02-07 09:08:17 +08:00
Florian Klink
1cc8ea4ec9 afew: 1.2.0 -> 1.3.0 2018-02-07 00:30:16 +01:00
Robert Schütz
b5ecdfa977 nixos/acme: Fix xml (#34683) 2018-02-06 23:27:28 +00:00
Casey Ransom
72cd8c09ce v8_3_16_14: fix on darwin
This was switched to use gcc5 for all platforms due to a mkSnapshot
error, which fixes Linux but currently fails for Darwin. I'm unsure if
there are other runtime failures, but this hasn't been building for
quite some time.
2018-02-06 17:54:16 -05:00
Daiderd Jordan
335ae38674
Merge pull request #33871 from dtzWill/fix/llvm-5-python-closure
llvm-5: add extra 'python' output for opt-viewer tool
2018-02-06 23:33:45 +01:00
Florian Klink
44dd0b6adb svn2git_kde: remove
marked as broken anyways
2018-02-06 22:55:19 +01:00
Michael Raskin
91eb41b138
Merge pull request #33416 from the-kenny/emacs-site-lisp-subdirectory-support
Emacs `site-lisp` subdirectory support
2018-02-06 21:37:07 +00:00
Michael Raskin
718de7c2e4
Merge pull request #33306 from bgamari/patch-2
haskell: Recommend use of hoogle --local
2018-02-06 21:34:10 +00:00
Michael Raskin
907474e649
Merge pull request #33088 from exFalso/add-subdl
init subdl package
2018-02-06 21:32:53 +00:00
Michael Raskin
4b481684b1
Add a date to name 2018-02-06 21:30:36 +00:00
Michael Raskin
fdcbb263ac
Merge pull request #32579 from leenaars/lwan
lwan: init -> 0.1
2018-02-06 21:26:18 +00:00
Joachim F
e9dd9967ef
Merge pull request #34395 from jonafato/keybase-1.0.40
keybase: 1.0.39 -> 1.0.40
2018-02-06 21:25:30 +00:00
Michael Raskin
8eba2a5be8
Merge pull request #31312 from binarin/emacs-package-set-overrides
emacs-packages: Cleanup and document for overrides
2018-02-06 21:22:23 +00:00
Michael Raskin
1137ba5a73
Merge pull request #27734 from jfrankenau/add-desktop-entries
Add desktop entry files for FreeCAD and ddccontrol
2018-02-06 21:21:04 +00:00
Luke Sandell
4de7e5cae0 dump1090: fix html path
Use correct variable syntax for GNU Make so that HTML resources
can be found when running `dump1090 --net`. Additionally, add
view1090 binary to output.
2018-02-06 22:15:59 +01:00
Raitis
4e63119c54 terraform: add the version component to terraform provider paths (#34497)
Terraform checks the provider versions, but this breaks if the versions
are not provided, as they can be, if the plugins are provided by nix.
2018-02-06 21:09:22 +00:00
Joachim Schiele
edeacd00ad security.acme: default name value via module system (#34388) 2018-02-06 21:08:57 +00:00
Tuomas Tynkkynen
c9d1bf3e76 platforms.nix: Include RPi 3 serial port in the kernel config 2018-02-06 22:14:09 +02:00
Tuomas Tynkkynen
685ceb999e kernel: Fix missing config options from platform
common-config.nix has:

${kernelPlatform.kernelExtraConfig or ""}

and indeed kernelExtraConfig is in hostPlatform.platform, and not in
hostPlatform. (Ugh.).
2018-02-06 22:13:57 +02:00
Jaakko Luttinen
44509195e5
pythonPackages.pytest-cram: 0.1.1 -> 0.2.0
This fixes pytest-cram after the recent pytest upgrading broke it.
2018-02-06 21:49:44 +02:00
Will Dietz
2e0540f346 bfg-repo-cleaner: 1.12.15 -> 1.13.0 2018-02-06 13:49:09 -06:00
Michael Raskin
5e8ae8d597
Merge pull request #34674 from dtzWill/feature/diff-pdf
diff-pdf: init at 2017-12-30.
2018-02-06 19:33:59 +00:00
Kosyrev Serge
6419664793
ghc841: bump to alpha3 2018-02-06 21:58:32 +03:00
Will Dietz
9e2993e75a diff-pdf: Try to fix darwin build 2018-02-06 12:57:52 -06:00
Will Dietz
b963f06f5a diff-pdf: init at 2017-12-30. 2018-02-06 11:57:55 -06:00
Claes Wallin (韋嘉誠)
cc2c594a9b hledger*: build correctly on darwin
- mkdir -p $out/share/info rather than assuming $out/share is there
 - find .info and .man* files correctly on darwin -- don't try to
   match the specific system name, there is nothing to gain from that

nix calls darwin darwin, but ghc calls it osx in its directory names.

closes #34644
2018-02-07 01:32:16 +08:00
John Ericson
63b8175281
Merge pull request #34351 from teto/kernel_wip
[RDY] buildLinux: Add more overrides
2018-02-06 12:08:12 -05:00
Matthieu Coudron
f620b1b693 kernel: buildLinux replaces import ./generic.nix
- defined buildLinux as generic.nix instead of manual-config.nix. This
makes kernel derivations a tad more similar to your typical derivations.
- moved $buildRoot to within the source folder, this way it doesn't have to be created before the unpackPhase
and make it easier to work on kernel source without running the unpackPhase
2018-02-07 10:07:13 +09:00
Peter Hoeg
d4df7aadf9 cryfs: 0.9.8 -> 0.9.9 2018-02-07 00:29:04 +08:00
Frederik Rietdijk
ef64766efb
Merge pull request #34653 from mbrgm/upgrade-unifi
unifi: 5.6.29 -> 5.6.30
2018-02-06 16:26:07 +00:00
Frederik Rietdijk
ec26c65bce
Merge pull request #34643 from dotlambda/dateparser
pythonPackages.dateparser: switch to parameterized and thereby fix Hydra test
2018-02-06 16:23:58 +00:00
Ryan Mulligan
8930a14422 autoconf-archive: 2017.03.21 -> 2017.09.28 2018-02-06 07:35:31 -08:00
adisbladis
ba3d1c0814
Merge pull request #34668 from unode/samtools-1.7
samtools & htslib: 1.6 -> 1.7
2018-02-06 23:17:56 +08:00
adisbladis
2570f738fd
Merge pull request #34670 from ryantm/antimony
antimony: 0.9.2 -> 0.9.3
2018-02-06 23:16:56 +08:00
adisbladis
2ee827ec8b
Merge pull request #34667 from ryantm/archivemount
archivemount: 0.8.3 -> 0.8.7
2018-02-06 23:16:12 +08:00
adisbladis
4c7374617a
Merge pull request #34665 from ryantm/augeas
augeas: 1.10.0 -> 1.10.1
2018-02-06 23:15:41 +08:00
adisbladis
5f17cd4c0b
Merge pull request #34669 from ryantm/bcunit
bcunit: 3.0 -> 3.0.2
2018-02-06 23:13:33 +08:00
Ryan Mulligan
977b996516 antimony: 0.9.2 -> 0.9.3 2018-02-06 07:01:01 -08:00
Ryan Mulligan
104551ed0b bcunit: 3.0 -> 3.0.2 2018-02-06 06:47:12 -08:00
Joachim F
8d466f7ae9
Merge pull request #34575 from jonafato/keybase-gui-icon
keybase-gui: fix missing desktop file
2018-02-06 14:44:50 +00:00
Joachim F
97ab8d8981
Merge pull request #17106 from spacefrogg/openafs
openafs: Refactor and introduce server module
2018-02-06 14:43:55 +00:00
Renato Alves
154d1d2f19
samtools: 1.6 -> 1.7 2018-02-06 15:38:00 +01:00
Renato Alves
b2284e0454
htslib: 1.6 -> 1.7 2018-02-06 15:37:50 +01:00
Bignaux Ronan
e2bf162f04 remove platforms.darwin support 2018-02-06 15:34:51 +01:00
Ryan Mulligan
94e449b699 archivemount: 0.8.3 -> 0.8.7 2018-02-06 06:27:25 -08:00