Commit Graph

14408 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
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
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
Peter Hoeg
d4df7aadf9 cryfs: 0.9.8 -> 0.9.9 2018-02-07 00:29:04 +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
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
Ryan Mulligan
94e449b699 archivemount: 0.8.3 -> 0.8.7 2018-02-06 06:27:25 -08:00
Ryan Mulligan
a48222b3e1 augeas: 1.10.0 -> 1.10.1 2018-02-06 06:19:01 -08:00
Ryan Mulligan
9801326d32 autorandr: 1.1 -> 1.4 2018-02-05 20:56:47 -08:00
Tuomas Tynkkynen
9548028a22 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/os-specific/linux/cpupower/default.nix
2018-02-06 04:11:23 +02:00
Will Dietz
74d928cf8b nix: enable more features in busybox shell to resolve build failures 2018-02-05 09:19:54 -06:00
Will Dietz
4faac207bc nix: fix config for echo/test on newer busybox
Matches
2f1a1c5a49
2018-02-05 09:18:39 -06:00
Bart Brouns
8a72d2a322 htop: 2.02 -> 2.1.0 2018-02-05 15:07:19 +01:00
adisbladis
9accca260e
Merge pull request #34617 from calvertvl/upd_fanficfare_2.22.0
fanficfare: 2.16.0 -> 2.22.0
2018-02-05 21:52:10 +08:00
adisbladis
50387619b0
Merge pull request #34612 from enumatech/fastlane
fastlane: 2.75.1 -> 2.80.0
2018-02-05 21:44:13 +08:00
Andreas Rammhold
1030042492
edid-decode: fixed missing version in name attribute 2018-02-05 14:31:43 +01:00
Andreas Rammhold
03a13a2f0b
Merge pull request #34599 from Chiiruno/master
edid-decode: init at git-2017-09-18
2018-02-05 13:29:31 +00:00
Victor Calvert
df133ea27a fanficfare: 2.16.0 -> 2.22.0 2018-02-05 05:45:01 -05:00
Peter Romfeld
bbebd26b13
fastlane: 2.75.1 -> 2.80.0 2018-02-05 16:50:53 +08:00
adisbladis
3adc9897ec
Merge pull request #34598 from markuskowa/freeipmi-pr
freeipmi: 1.5.7 -> 1.6.1
2018-02-05 13:53:43 +08:00
Tuomas Tynkkynen
5d2b4a5dc8 picocom: 3.0 -> 3.1 2018-02-05 01:02:50 +02:00
Okina Matara
e35ca9af50 edid-decode: init at git-2017-09-18 2018-02-04 16:49:16 -06:00
Frederik Rietdijk
f0e404b1de
Merge pull request #34591 from womfoo/bump/facter-3.9.3
facter: 3.9.0 -> 3.9.3 and dependency libwhereami: 0.1.1 -> 0.1.3
2018-02-04 20:03:24 +00:00
Frederik Rietdijk
5967321b27
Merge pull request #34590 from womfoo/bump/pick-2.0.1
pick: 1.9.0 -> 2.0.1
2018-02-04 18:58:13 +00:00
Markus Kowalewski
ca1a55cabd
freeipmi: 1.5.7 -> 1.6.1 2018-02-04 10:41:36 -08:00
John Ericson
de243f244f
Merge pull request #34312 from lopsided98/cpupower-pciutils-cross
cpupower, pciutils: enable cross compiling
2018-02-04 11:51:48 -05:00
Michael Weiss
4db7c04160 fim: 0.5rc3 -> 0.6 2018-02-04 16:15:55 +01:00
Frederik Rietdijk
c1d79509a0
Merge pull request #34553 from NixOS/python-unstable
Python package updates
2018-02-04 13:29:23 +00:00
Kranium Gikos Mendoza
99aab3dd56 facter: 3.9.0 -> 3.9.3 2018-02-05 00:29:06 +11:00
Kranium Gikos Mendoza
db40ca8d0a pick: 1.9.0 -> 2.0.1 2018-02-05 00:20:04 +11:00
Jon Banafato
7e714bda87 keybase-gui: 1.0.39 -> 1.0.40 2018-02-03 19:49:23 -05:00
Jon Banafato
16ac5eb7f0 kbfs: 20171004.40555d -> 1.0.40 2018-02-03 19:49:23 -05:00
Jon Banafato
ac1abbf4fc keybase: 1.0.39 -> 1.0.40 2018-02-03 19:49:23 -05:00
Jon Banafato
4bef2fbc4f keybase-gui: fix missing desktop file
The keybase-gui package doesn't currently include the `.desktop` file
and supporting icons. This change fixes that.
2018-02-03 19:44:22 -05:00
Tobias Pflug
32d4b018a7 grobi: init at 0.3.0 2018-02-03 22:54:18 +01:00
John Wiegley
0ef512fe7a ditaa: 0.9 -> 0.11 (adds --svg support) 2018-02-03 21:00:17 +01:00
Frederik Rietdijk
763a372911 awscli: 1.4.29 -> 1.4.32 2018-02-03 17:43:30 +01:00
Frederik Rietdijk
55e0f12761 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-03 09:48:42 +01:00
Frederik Rietdijk
14480a9288
Merge pull request #34542 from womfoo/fix/bonfire-deps
bonfire: bump arrow dependency (fixes build)
2018-02-03 08:30:54 +00:00
Frederik Rietdijk
274d4eaa00
Merge pull request #34493 from Gricad/udocker
udocker: init at 1.1.1
2018-02-03 08:07:35 +00:00
Tuomas Tynkkynen
10c8e6d0c5 Merge remote-tracking branch 'upstream/master' into staging 2018-02-03 02:50:21 +02:00
Kranium Gikos Mendoza
d135d14214 bonfire: bump arrow dependency 2018-02-03 10:35:14 +11:00
Tuomas Tynkkynen
0bfa9a9dc2 ethtool: 4.13 -> 4.15 2018-02-02 18:15:18 +02:00
Joachim F
374d6dcf2a
Merge pull request #34509 from dotlambda/ttwatch
ttwatch: 2017-12-31 -> 2018-02-01
2018-02-02 15:40:39 +00:00
Bruno Bzeznik
b2cf8cff7d udocker: init at 1.1.1 2018-02-02 13:59:59 +01:00
Jörg Thalheim
9a5fe79d07
Merge pull request #34397 from griff/fix/awstats-tools
awstats: add tools directory
2018-02-02 12:48:07 +00:00
adisbladis
65170e9404
Merge pull request #34504 from dywedir/tlp
tlp: 1.0 -> 1.1
2018-02-02 12:28:18 +08:00