commit 3348905cdecff53190eb011e76ab2dba5855c107 · pyrox.dev/nixpkgs

+6

nixos/doc/manual/release-notes/rl-1703.xml

···

       15
       15
        
           xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs

     

       16
       16
        
           manual</link> for more information.</para>

     

       17
       17
        
         </listitem>

     

       18
       18
       +
       

     

       19
       19
       +
         <listitem>

     

       20
       20
       +
           <para>X.org server uses branch 1.19.  Due to ABI incompatibilities,

     

       21
       21
       +
             <literal>ati_unfree</literal> keeps forcing 1.17

     

       22
       22
       +
             and <literal>amdgpu-pro</literal> starts forcing 1.18.</para>

     

       23
       23
       +
         </listitem>

     

       18
       24
        
       </itemizedlist>

     

       19
       25
        
       

     

       20
       26
        
       <para>The following new services were added since the last release:</para>

+5 -5

pkgs/servers/x11/xorg/default.nix

···

       2364
       2364
        
         }) // {inherit ;};

     

       2365
       2365
        
       

     

       2366
       2366
        
         xorgserver = (mkDerivation "xorgserver" {

     

       2367
       2367
       -
           name = "xorg-server-1.18.4";

     

       2367
       2367
       +
           name = "xorg-server-1.19.1";

     

       2368
       2368
        
           builder = ./builder.sh;

     

       2369
       2369
        
           src = fetchurl {

     

       2370
       2370
       -
             url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2;

     

       2371
       2371
       -
             sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";

     

       2370
       2370
       +
             url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2;

     

       2371
       2371
       +
             sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr";

     

       2372
       2372
        
           };

     

       2373
       2373
       -
           buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];

     

       2373
       2373
       +
           buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];

     

       2374
       2374
        
           meta.platforms = stdenv.lib.platforms.unix;

     

       2375
       2375
       -
         }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;};

     

       2375
       2375
       +
         }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;};

     

       2376
       2376
        
       

     

       2377
       2377
        
         xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {

     

       2378
       2378
        
           name = "xorg-sgml-doctools-1.11";

+1

pkgs/servers/x11/xorg/overrides.nix

···

       428
       428
        
               damageproto xcmiscproto  bigreqsproto

     

       429
       429
        
               inputproto xextproto randrproto renderproto presentproto

     

       430
       430
        
               dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto

     

       431
       431
       +
               libXfont2

     

       431
       432
        
             ];

     

       432
       433
        
             # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316

     

       433
       434
        
             commonPatches = [ ];

+1 -1

pkgs/servers/x11/xorg/tarballs-7.7.list

···

       185
       185
        
       mirror://xorg/individual/app/xmag-1.0.6.tar.bz2

     

       186
       186
        
       mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2

     

       187
       187
        
       mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2

     

       188
       188
       -
       mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2

     

       188
       188
       +
       mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2

     

       189
       189
        
       mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2

     

       190
       190
        
       mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2

     

       191
       191
        
       mirror://xorg/individual/app/xprop-1.2.2.tar.bz2