public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"

Browse Source 
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
This commit is contained in:
Vladimír Čunát
2020-10-26 08:19:17 +01:00
parent 309ce3f8a1
commit 336bc8283b
92 changed files with 771 additions and 2686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/x11/xorg/default.nix
+18 -18
View File
@@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation {
name = "libX11-1.6.8";
name = "libX11-1.6.12";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2";
sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj";
url = "mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2";
sha256 = "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation {
name = "libXvMC-1.0.11";
name = "libXvMC-1.0.12";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2";
sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja";
url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2";
sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation {
name = "libxcb-1.13.1";
name = "libxcb-1.14";
builder = ./builder.sh;
src = fetchurl {
url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2";
sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8";
url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz";
sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig python ];
@@ -1431,11 +1431,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation {
name = "xcb-proto-1.13";
name = "xcb-proto-1.14.1";
builder = ./builder.sh;
src = fetchurl {
url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2";
sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz";
sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig python ];
@@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
name = "xf86-input-libinput-0.28.2";
name = "xf86-input-libinput-0.30.0";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2";
sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq";
url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2";
sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation {
name = "xorgproto-2019.1";
name = "xorgproto-2020.1";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2";
sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6";
url = "mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2";
sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];