mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Code Issues Wiki Activity
170252 commits 203 branches 125 tags 5.6 GiB
Commit graph

9191 commits

Author SHA1 Message Date
Jörg Thalheim 22334ae168
Merge pull request #55313 from r-ryantm/auto-update/guvcview 
guvcview: 2.0.5 -> 2.0.6
 2019-02-06 10:40:14 +00:00
R. RyanTM 0e28f3c318 firejail: 0.9.56 -> 0.9.58 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/firejail/versions
 2019-02-06 01:55:03 -08:00
R. RyanTM 08a54aac01 guvcview: 2.0.5 -> 2.0.6 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/guvcview/versions
 2019-02-05 23:52:43 -08:00
Profpatsch a0a203eb5c sdnotify-wrapper: init at unversioned 2019-02-05 14:23:13 +01:00
hhm f2f1180c22 B"H fix error 2019-02-04 19:35:44 -05:00
Vladyslav M 8626808c72
Merge pull request #54752 from eadwu/bcachefs/20190123 
linux_testing_bcachefs,bcachefs-tools: 20190123
 2019-02-04 22:53:38 +02:00
Tim Steinbach c77728de7b
linux: 5.0-rc4 -> 5.0-rc5 2019-02-03 19:31:25 -05:00
hhm 4e891a47e6 rtl8821ce: init at 5.2.5_1.26055.20180108 2019-02-03 17:02:25 -05:00
Jan Malakhovski dd5bcb34c9 lxcfs: move defaults to package file 2019-02-03 15:33:22 +00:00
Jan Malakhovski 23cfa1d290 guvcview: move defaults to package file 2019-02-03 15:33:17 +00:00
Jan Malakhovski 0f4eb7f977 conky: move defaults to package file 2019-02-03 15:33:12 +00:00
Vladimír Čunát 32767d139f
Merge branch 'staging-next' 
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
 2019-02-20 09:38:45 +01:00
Florian Klink aaa0228240
Merge pull request #56068 from andir/linux-firmware-nonfree 
firmwareLinuxNonfree: 2018-12-13 -> 2019-02-13
 2019-02-20 01:59:37 +01:00
Andreas Rammhold b9ac4c1dd3
firmwareLinuxNonfree: 2018-12-13 -> 2019-02-13 2019-02-19 22:59:35 +01:00
Michael Raskin 446520bb9b
Merge pull request #56026 from oxij/tree/move-defaults-to-package-files-half-cuda 
all-packages.nix: move defaults to package files continues^2
 2019-02-19 21:54:02 +00:00
Vladimír Čunát 024407bf9a
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1505754
 2019-02-19 12:11:04 +01:00
Vladimír Čunát bce12effa7
syslinux: fix build with new binutils 
Also fix the URL of the other patch.
 2019-02-19 12:05:51 +01:00
Vladimír Čunát 555912067f
Revert "syslinux: 2015-11-09 -> 2019-02-07" 
This reverts commit 0b49d5dd68 #55500.
I'm sorry, I'm unable to fix the build quickly in other way than
atop the older version.  Certainly feel free to improve the approach.
 2019-02-19 12:04:43 +01:00
Frederik Rietdijk 815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Frederik Rietdijk 6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
Frederik Rietdijk 7257dedd7c Merge master into staging-next 2019-02-13 12:33:29 +01:00
Matthew Bauer 5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Graham Christensen 1bcbbe08e4
keyutils: patch out unreproducibility 2019-02-06 22:20:16 -05:00
Jan Malakhovski 40cde4d5d7 pcmciaUtils: move defaults to package file 2019-02-03 15:32:20 +00:00
Franz Pletz 36682692a0
batman-adv: 2018.4 -> 2019.0 2019-02-03 08:59:32 +01:00
Samuel Dionne-Riel 09af2fb9e0 linux: Removes the previously removed raspberry pi patch 
There seems to have been an oopsie with the rebase.
 2019-02-02 14:29:01 -05:00
Samuel Dionne-Riel 196af4b359 Revert "linuxPackages_4_{19,20}: works around bug with overlayfs." 
This reverts commit de86af48fa.

(Manual revert due to conflicts.)

See #54509

The patch is causing overlayfs to misbehave.
 2019-02-02 12:18:16 -05:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next 
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
 2019-02-01 09:22:29 +01:00
Jan Tojnar 65e6d80ecd
Merge pull request #53425 from dtzWill/update/fwupd-1.2.3 
fwupd: 1.2.1 -> 1.2.3

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
 2019-01-31 23:22:38 +01:00
markuskowa c3065c55d4
Merge pull request #54879 from markuskowa/upd-rdma-core 
rdma-core: 21 -> 22
 2019-01-31 21:57:24 +01:00
Joachim F bc84a22989
Merge pull request #54977 from teto/kernel_fix 
linux: (re)take into account extraConfig
 2019-01-31 19:46:11 +00:00
Tim Steinbach 705207ec9b
linux: 4.20.5 -> 4.20.6 2019-01-31 07:19:07 -05:00
Tim Steinbach e4c1ce97c3
linux: 4.19.18 -> 4.19.19 2019-01-31 07:18:36 -05:00
Tim Steinbach f623daca21
linux: 4.14.96 -> 4.14.97 2019-01-31 07:18:23 -05:00
Tim Steinbach 468b6cea72
linux: 4.9.153 -> 4.9.154 2019-01-31 07:17:38 -05:00
Matthieu Coudron a5a796222b linux: (re)take into account extraConfig 
PR #42838 wrongly started to ignore extraConfig. This fixes that.
 2019-01-31 13:34:42 +09:00
Jörg Thalheim 73fda89c7c
Merge pull request #54258 from aij/zfs 
zfsUnstable: 0.8.0-rc2 -> 0.8.0-rc3
 2019-01-30 15:07:25 +00:00
Vladimír Čunát 79a7cd6c55
syslinux: fix build with new binutils 
Also fix the URL of the other patch.
 2019-01-29 22:18:49 +01:00
Silvan Mosberger 96c9575b3e
Merge pull request #54769 from tadeokondrak/update-libratbag 
libratbag: 0.9.903 -> 0.9.904
 2019-01-29 21:53:49 +01:00
Will Dietz d5c660c9dd iwd: don't use '/usr' prefix, prefer placeholder over quote-and-pray 2019-01-28 21:41:23 -06:00
Markus Kowalewski ef729e46d0
rdma-core: 21 -> 22 2019-01-28 16:05:10 +01:00
Silvan Mosberger 51d2eed83b
Merge pull request #42838 from teto/kernel_autoconf 
[RFC] add ability to merge structured configs
 2019-01-28 10:38:00 +01:00
Tadeo Kondrak d80651d5d9
libratbag: 0.9.903 -> 0.9.904 2019-01-28 01:04:03 -07:00
Tim Steinbach e1ddb90ca8
linux: 4.20-rc4 -> 4.20-rc5 2019-01-27 20:56:23 -05:00
Edmund Wu da0fbf4dd7
linux_testing_bcachefs: 4.18.2018.10.12 -> 4.20.2019.01.23 2019-01-27 20:46:55 -05:00
Matthieu Coudron 7aacbdb898 linux: convert hardened-config to a structured one 2019-01-28 09:07:24 +09:00
Matthieu Coudron 3bb7b3f02e linux: ability to merge structured configs 
This should make the composability of kernel configurations more straigthforward.

- now distinguish freeform options from tristate ones
- will look for a structured config in kernelPatches too
one can now access the structuredConfig from a kernel via linux_test.configfile.structuredConfig
in order to reinject it into another kernel, no need to rewrite the config from scratch

The following merge strategies are used in case of conflict:
-- freeform items must be equal or they conflict (mergeEqualOption)
-- for tristate (y/m/n) entries, I use the mergeAnswer strategy which takes the best available value, "best" being defined by the user (by default "y" > "m" > "n", e.g. if one entry is both marked "y" and "n", "y" wins)
-- if one item is both marked optional/mandatory, mandatory wins (mergeFalseByDefault)
 2019-01-28 09:06:33 +09:00
Jan Tojnar dd06999e32
fwupd: fix installed tests 2019-01-28 00:15:00 +01:00
Tim Steinbach 39fdfd0eb1
linux: 4.20.4 -> 4.20.5 2019-01-27 16:12:13 -05:00
Tim Steinbach 4ab5604c85
linux: 4.19.17 -> 4.19.18 2019-01-27 16:12:13 -05:00
Tim Steinbach 19505bb8d1
linux: 4.14.95 -> 4.14.96 2019-01-27 16:12:12 -05:00
Tim Steinbach 4606793349
linux: 4.9.152 -> 4.9.153 2019-01-27 16:12:12 -05:00
Tim Steinbach 6df6bb42b5
linux: 4.4.171 -> 4.4.172 2019-01-27 16:12:12 -05:00
Will Dietz 7dd30dd64b
fwupd: put plugins in "out", restore "lib" output w/o cycle 2019-01-27 21:26:43 +01:00
Will Dietz 55fa570046
fwupd: blacklist test plugin by default 
Don't add the testing "webcam" device,
which is unexpected to see when querying
what devices fwupd believes exist :).

Won't change behavior for anyone defining
the blacklistPlugin option already,
but doesn't seem worth making more complicated.
 2019-01-27 21:26:42 +01:00
Will Dietz 461699607e
fwupd: 1.2.2 -> 1.2.3 
Drop lib output to avoid cycle.
 2019-01-27 21:26:42 +01:00
Will Dietz 022c0165c2
Merge pull request #53907 from dtzWill/update/bcc-0.8.0 
bcc: 0.7.0 -> 0.8.0
 2019-01-27 13:36:03 -06:00
Will Dietz f34e604cac
Merge pull request #54059 from dtzWill/update/fwts-19.01.00 
fwts: 18.12.00 -> 19.01.00
 2019-01-27 13:33:51 -06:00
Matthew Bauer 92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Tim Steinbach 43c6a83041
conky: journal support 2019-01-26 22:14:10 -05:00
Jörg Thalheim ba34ffc665
Merge pull request #54619 from Mic92/remove-wkennington 
treewide: remove wkennington as maintainer
 2019-01-26 23:37:27 +00:00
Vladimír Čunát 2c226107cb
systemd-cryptsetup-generator: fixup linkage 
It got broken by 74a64a8a6 #53483.
But IMO it's *this* expression that was written in a too fragile way.
 2019-01-26 14:16:56 +01:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer 
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
 2019-01-26 10:05:32 +00:00
Tim Steinbach 3da56c7844
conky: 1.11.1 -> 1.11.2 2019-01-25 22:57:53 -05:00
Joachim F f6414428ed
Merge pull request #53511 from joachifm/kernel-32bit-emu-feature-flag 
linux: flag to indicate 32bit emulation support
 2019-01-25 14:13:45 +00:00
Will Dietz 68d09065ef
Merge pull request #54440 from dtzWill/update/musl-1.1.21 
musl: 1.1.20 -> 1.1.21
 2019-01-24 07:56:12 -06:00
Tim Steinbach 8ee43e01fa
linux: 4.9.151 -> 4.9.152 2019-01-23 07:10:45 -05:00
Tim Steinbach 6da5e2d45f
linux: 4.20.3 -> 4.20.4 2019-01-23 07:10:35 -05:00
Tim Steinbach 1b8beae40b
linux: 4.19.16 -> 4.19.17 2019-01-23 07:10:27 -05:00
Tim Steinbach 5f0a4ee69f
linux: 4.14.94 -> 4.14.95 2019-01-23 07:10:18 -05:00
Cray Elliott 9b055427f5 alsaLib: 1.1.7 -> 1.1.8 
also remove a patch that is now obsolete
 2019-01-22 13:00:17 -08:00
Vladimír Čunát 3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Will Dietz 0450d28a1e musl: 1.1.20 -> 1.1.21 
https://www.openwall.com/lists/musl/2019/01/21/8

\o/
 2019-01-21 16:10:36 -06:00
Tim Steinbach 538ce21fe8
linux: 5.0-rc2 -> 5.0-rc3 2019-01-21 08:14:14 -05:00
Tim Steinbach 8f1b27401c
kernelHeaders: 4.18.3 -> 4.19.16 2019-01-20 14:21:25 -05:00
Frederik Rietdijk ca2edf79f7 Merge master into staging-next 2019-01-20 18:22:17 +01:00
markuskowa eebeb363da
Merge pull request #54250 from r-ryantm/auto-update/alsa-utils 
alsaUtils: 1.1.7 -> 1.1.8
 2019-01-20 16:03:48 +01:00
Vladimír Čunát 3fa77297b5
linux: avoid memory hotplug support on most platforms 
It broke i686 build, and it's probably not worth it on others, too.
/cc #54095 e63414078a.
 2019-01-19 19:22:02 +01:00
Vladimír Čunát 23eb5e846d
Merge #54095: linux: enable memory hotplug support 2019-01-19 16:26:01 +01:00
Frederik Rietdijk d531da6f8a
Merge pull request #54094 from rnhmjoj/shell 
treewide: use ${stdenv.shell} instead of /bin/sh where possible
 2019-01-19 14:15:51 +01:00
Ivan Jager 1f2a3fe040 zfsUnstable: Fetch source by tag and patch by hash. 2019-01-19 06:22:24 -06:00
Frederik Rietdijk f8b45e2d84 Merge staging-next into staging 2019-01-19 09:24:01 +01:00
Edmund Wu aaff01ecbf nvidia_x11: 415.25 -> 415.27 2019-01-19 09:22:10 +01:00
Matthew Bauer 1c02863317
busybox: give priority of 10 
Lots of packages provide this. Usually we don't want the busybox version.
 2019-01-18 18:16:37 -05:00
Jörg Thalheim a73ad4615a
android-udev-rules: 20181031 -> 20190114 2019-01-18 13:27:38 +00:00
Aaron Andersen e63414078a Enable memory hotplug support 2019-01-18 13:17:33 +00:00
Jörg Thalheim f1d7cc678b
zfs: mark as broken on 4.20 2019-01-18 08:53:43 +00:00
R. RyanTM d04a50da7c atop: 2.3.0 -> 2.4.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/atop/versions
 2019-01-17 20:35:46 -08:00
Ivan Jager d1e838ed23 zfsUnstable: 0.8.0-rc2 -> 0.8.0-rc3 2019-01-17 22:08:15 -06:00
R. RyanTM 0e1a60bef4 alsaUtils: 1.1.7 -> 1.1.8 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/alsa-utils/versions
 2019-01-17 19:52:35 -08:00
Jan Tojnar af3758e0b5
Merge branch 'master' into staging 2019-01-17 21:49:16 +01:00
Danylo Hlynskyi 23a13b562c
kernel config: add support for CONFIG_SQUASHFS_ZSTD (#52967) 
Also, allow override `make-squashfs.nix` compression parameters.
 2019-01-17 15:24:44 +02:00
Tim Steinbach bae1a0f825
linux: 4.20.2 -> 4.20.3 2019-01-17 06:56:20 -05:00
Tim Steinbach b4ab6ffb7f
linux: 4.19.15 -> 4.19.16 2019-01-17 06:56:08 -05:00
Tim Steinbach 6ad56550e4
linux: 4.14.93 -> 4.14.94 2019-01-17 06:55:59 -05:00
Tim Steinbach 1e62588421
linux: 4.9.150 -> 4.9.151 2019-01-17 06:55:42 -05:00
Tim Steinbach 2833865206
linux: 4.4.170 -> 4.4.171 2019-01-17 06:55:31 -05:00
Frederik Rietdijk 9cfae76fc5 Merge staging-next into staging 2019-01-17 09:21:29 +01:00
Will Dietz 8238e19c2f iwd: 0.12 -> 0.14 
https://git.kernel.org/pub/scm/network/wireless/iwd.git/diff/ChangeLog?h=0.13
https://git.kernel.org/pub/scm/network/wireless/iwd.git/diff/ChangeLog?h=0.14
 2019-01-16 17:16:42 -06:00