1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 23:24:35 +00:00
Commit graph

8964 commits

Author SHA1 Message Date
Vladimír Čunát 70bff06140
Merge branch 'master' into staging 2019-01-02 17:19:23 +01:00
David Guibert d8e907ba18 conky: 1.11.0 -> 1.11.1 (#53157)
This fixes #52797.
2019-01-02 09:54:22 +01:00
Jan Tojnar b2b921bdca
Merge pull request #53149 from jtojnar/qrencode-cleanup
qrencode: merge with libqrencode
2019-01-02 02:18:22 +01:00
R. RyanTM 46e7ce0526 lxc: 3.0.2 -> 3.0.3 (#52239)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lxc/versions
2019-01-01 20:35:37 +01:00
Jan Tojnar c5c2ac4f45
qrencode: merge with libqrencode 2019-01-01 17:19:07 +01:00
Frederik Rietdijk 070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Tim Steinbach d6805baded
linux: 4.19.12 -> 4.19.13 2018-12-30 09:57:54 -05:00
Tim Steinbach 226eb52715
linux: 4.14.90 -> 4.14.91 2018-12-30 09:57:54 -05:00
Tim Steinbach a7bd7a38ea
linux: 4.9.147 -> 4.9.148 2018-12-30 09:57:53 -05:00
Ivan Kozik 1c8fea18e2 kernel/patches.nix: remove hard tabs 2018-12-28 09:06:56 +01:00
Frederik Rietdijk 10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
Dmitry Kalinkin 3edd5cb227
Merge pull request #51294 from eadwu/nvidia_x11/legacy_390
nvidia: expose nvidia_x11_legacy390
2018-12-27 09:08:53 -05:00
markuskowa 98561c789c
Merge pull request #52597 from lopsided98/lvm2-no-parallel
lvm2: disable parallel building
2018-12-27 14:21:25 +01:00
Samuel Dionne-Riel 889ef35303 linuxPackages_4_{19,20}: works around bug with overlayfs.
See: https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626
2018-12-26 22:51:31 +00:00
Samuel Dionne-Riel 7093970e1d linuxPackages.ena: 1.5.2 -> 2.0.2 2018-12-26 11:03:10 +00:00
Samuel Dionne-Riel d8cf1db93f linuxPackages.ndiswrapper: updated to fix build on recent kernels
While the upstream commit says 4.18, it builds for 4.19 and 4.20.
2018-12-26 11:03:10 +00:00
Frederik Rietdijk e45ca47f14 Merge staging-next into staging 2018-12-26 09:30:32 +01:00
Craig Younkins 8b12b17df3
treewide: Fix broken Gmane URLs 2018-12-25 22:34:55 -05:00
Jan Tojnar c45e9d0fac
Merge branch 'master' into staging 2018-12-25 17:03:57 +01:00
Ben Wolsieffer 369af2f5b2 lvm2: disable parallel building 2018-12-24 15:10:48 -05:00
Michael Raskin aac3ae3be6
Merge pull request #52762 from r-ryantm/auto-update/sysdig
linuxPackages.sysdig: 0.24.1 -> 0.24.2
2018-12-24 18:18:04 +00:00
Tim Steinbach 24cdaa7b48
linux-libre: 15715 -> 15814 2018-12-24 12:33:24 -05:00
Tim Steinbach 8f9c2f9726
linux: Add 4.20 2018-12-24 12:33:24 -05:00
Jan Tojnar ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
R. RyanTM 4fa7bbf486 linuxPackages.sysdig: 0.24.1 -> 0.24.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sysdig/versions
2018-12-24 02:17:58 -08:00
Michael Weiss 1259a24c05 fuse3: 3.3.0 -> 3.4.1 2018-12-22 17:56:42 +01:00
Tim Steinbach af6c117fac
linux: 4.19.11 -> 4.19.12 2018-12-21 09:11:02 -05:00
Tim Steinbach dea57f15e9
linux: 4.14.89 -> 4.14.90 2018-12-21 09:10:54 -05:00
Tim Steinbach a5f447e16a
linux: 4.9.146 -> 4.9.147 2018-12-21 09:10:45 -05:00
Tim Steinbach 54ce2e016b
linux: 4.4.168 -> 4.4.169 2018-12-21 09:10:24 -05:00
Tim Steinbach 98ac5710bd
kernel-config: CIFS_POSIX no longer exists 2018-12-21 09:10:17 -05:00
Maximilian Bosch 66bea3d206
Merge pull request #52538 from dtzWill/update/fwts-18.12.00
fwts: 18.11.00 -> 18.12.00
2018-12-20 19:35:58 +01:00
Tim Steinbach 1b84b9f725
linux: 4.19.10 -> 4.19.11 2018-12-20 10:46:17 -05:00
Will Dietz 76127c322d fwts: enable parallel building 2018-12-19 13:37:57 -06:00
Will Dietz 926965d4b1 fwts: 18.11.00 -> 18.12.00 2018-12-19 13:37:31 -06:00
Frederik Rietdijk 9ab61ab8e2 Merge staging-next into staging 2018-12-19 09:00:36 +01:00
Frederik Rietdijk 911d1853ca Merge master into staging-next 2018-12-19 08:57:41 +01:00
R. RyanTM cbf9402574 libcap: 2.25 -> 2.26
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libcap/versions
2018-12-18 15:33:16 -05:00
volth fed7914539
Merge branch 'staging' into make-perl-pathd 2018-12-18 17:13:27 +00:00
Tim Steinbach 4d14879081
linux: 4.4.167 -> 4.4.168 2018-12-18 09:12:34 -05:00
Frederik Rietdijk 826ab7026e Merge master into staging-next 2018-12-18 09:22:17 +01:00
Matthew Bauer 06bf67d7dd
Merge pull request #51018 from plchldr/rtl8821a
rtl8821a: init at 5.1.5
2018-12-17 23:36:36 -06:00
Tim Steinbach 31ddf1f136
linux: 4.19.9 -> 4.19.10 2018-12-17 09:19:41 -05:00
Tim Steinbach c5234d7dbd
linux: 4.14.88 -> 4.14.89 2018-12-17 09:19:41 -05:00
Tim Steinbach 53c490a7ee
linux: 4.9.145 -> 4.9.146 2018-12-17 09:19:41 -05:00
Franz Pletz 4a73fb9717
Merge pull request #52158 from danielfullmer/rtl8812au-5.2.20.2
rtl8812au: 5.2.20_25672.20171213 -> 5.2.20.2_28373.20180619
2018-12-17 11:53:14 +00:00
Franz Pletz 307404bfa5
Merge pull request #52423 from eadwu/linux_testing/4.20-rc7
linux_testing: 4.20-rc6 -> 4.20-rc7
2018-12-17 11:17:56 +00:00
Ivan Kozik 9314c6a563 firejail: disable parallel building
firejail was frequently failing to build on my Hydra machine at -j16, and
the error looked like a typical parallel build problem:

<3>make[1]: Entering directory '/build/firejail-0.9.56/src/fcopy'
<3>gcc -ggdb  -O2 -DVERSION='"0.9.56"'   -DPREFIX='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56"'  -DSYSCONFDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/etc/firejail"' -DLIBDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/lib"' -DHAVE_X11 -DHAVE_PRIVATE_HOME  -DHAVE_OVERLAYFS -DHAVE_SECCOMP -DHAVE_GLOBALCFG -DHAVE_SECCOMP_H -DHAVE_CHROOT -DHAVE_NETWORK -DHAVE_USERNS -DHAVE_FILE_TRANSFER -DHAVE_WHITELIST -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security -mindirect-branch=thunk   -c main.c -o main.o
<3>gcc  -pie -Wl,-z,relro -Wl,-z,now -lpthread -o fcopy main.o
<3>make[1]: Leaving directory '/build/firejail-0.9.56/src/fcopy'
<3>make -C src/fldd
<3>make[1]: Entering directory '/build/firejail-0.9.56/src/fldd'
<3>gcc -ggdb  -O2 -DVERSION='"0.9.56"'   -DPREFIX='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56"'  -DSYSCONFDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/etc/firejail"' -DLIBDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/lib"' -DHAVE_X11 -DHAVE_PRIVATE_HOME  -DHAVE_OVERLAYFS -DHAVE_SECCOMP -DHAVE_GLOBALCFG -DHAVE_SECCOMP_H -DHAVE_CHROOT -DHAVE_NETWORK -DHAVE_USERNS -DHAVE_FILE_TRANSFER -DHAVE_WHITELIST -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security -mindirect-branch=thunk   -c main.c -o main.o
<3>gcc  -pie -Wl,-z,relro -Wl,-z,now -lpthread -o fldd main.o ../lib/ldd_utils.o
<3>make[1]: Leaving directory '/build/firejail-0.9.56/src/fldd'
<3>make -C src/libpostexecseccomp
<3>make[1]: Entering directory '/build/firejail-0.9.56/src/libpostexecseccomp'
<3>gcc -ggdb  -O2 -DVERSION='"0.9.56"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security  -c libpostexecseccomp.c -o libpostexecseccomp.o
<3>gcc -pie -Wl,-z,relro -Wl,-z,now -shared -fPIC -z relro -o libpostexecseccomp.so libpostexecseccomp.o -ldl
<3>make[1]: Leaving directory '/build/firejail-0.9.56/src/libpostexecseccomp'
<3>src/fseccomp/fseccomp default seccomp
<3>src/fsec-optimize/fsec-optimize seccomp
<3>/nix/store/6abyjgibafsbhlc7v7lab50mb3dj81jg-bash-4.4-p23/bin/bash: src/fsec-optimize/fsec-optimize: No such file or directory
<3>make: *** [Makefile:43: filters] Error 127
<3>builder for '/nix/store/30srqmpqrjyr11nhx4jbpr84m9pnmyv5-firejail-0.9.56.drv' failed with exit code 2
2018-12-17 06:41:44 +00:00
Edmund Wu cb6c9af457
linux_testing: 4.20-rc6 -> 4.20-rc7 2018-12-16 22:09:03 -05:00
Franz Pletz b213de9328
Merge pull request #52265 from ikervagyok/firmware
firmware-linux-nonfree: 20181017 -> 20181213
2018-12-17 02:18:07 +00:00