diff options
| author | Felix Buehler <account@buehler.rocks> | 2021-06-09 15:56:10 +0200 |
|---|---|---|
| committer | Felix Buehler <account@buehler.rocks> | 2021-06-14 22:20:35 +0200 |
| commit | 6c48964a0de5a031a50596f95c8668f16e485be7 (patch) | |
| tree | 4a4b018a2f541f56479d180b3964699cba68bc14 /pkgs/servers/x11 | |
| parent | 5baab3cd744beafe9c5ccc74debdc0db0090649b (diff) | |
| download | nixpkgs-6c48964a0de5a031a50596f95c8668f16e485be7.tar nixpkgs-6c48964a0de5a031a50596f95c8668f16e485be7.tar.gz nixpkgs-6c48964a0de5a031a50596f95c8668f16e485be7.tar.bz2 nixpkgs-6c48964a0de5a031a50596f95c8668f16e485be7.tar.lz nixpkgs-6c48964a0de5a031a50596f95c8668f16e485be7.tar.xz nixpkgs-6c48964a0de5a031a50596f95c8668f16e485be7.tar.zst nixpkgs-6c48964a0de5a031a50596f95c8668f16e485be7.zip | |
xorg: change generator "name" to "pname" & "version"
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 663 | ||||
| -rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 10 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 |
3 files changed, 451 insertions, 224 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index fbfbb86a5e0..1f3638f5141 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -6,7 +6,8 @@ lib.makeScope newScope (self: with self; { inherit pixman; appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { - name = "appres-1.0.5"; + pname = "appres"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/appres-1.0.5.tar.bz2"; @@ -19,7 +20,8 @@ lib.makeScope newScope (self: with self; { }) {}; bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "bdftopcf-1.1"; + pname = "bdftopcf"; + version = "1.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2"; @@ -32,7 +34,8 @@ lib.makeScope newScope (self: with self; { }) {}; bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "bitmap-1.0.9"; + pname = "bitmap"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/bitmap-1.0.9.tar.gz"; @@ -45,7 +48,8 @@ lib.makeScope newScope (self: with self; { }) {}; editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "editres-1.0.7"; + pname = "editres"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/editres-1.0.7.tar.bz2"; @@ -58,7 +62,8 @@ lib.makeScope newScope (self: with self; { }) {}; encodings = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "encodings-1.0.5"; + pname = "encodings"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/encodings-1.0.5.tar.bz2"; @@ -71,7 +76,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-100dpi-1.0.3"; + pname = "font-adobe-100dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2"; @@ -85,7 +91,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-75dpi-1.0.3"; + pname = "font-adobe-75dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2"; @@ -99,7 +106,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-utopia-100dpi-1.0.4"; + pname = "font-adobe-utopia-100dpi"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2"; @@ -113,7 +121,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-utopia-75dpi-1.0.4"; + pname = "font-adobe-utopia-75dpi"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2"; @@ -127,7 +136,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-utopia-type1-1.0.4"; + pname = "font-adobe-utopia-type1"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2"; @@ -141,7 +151,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "font-alias-1.0.3"; + pname = "font-alias"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2"; @@ -154,7 +165,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-arabic-misc-1.0.3"; + pname = "font-arabic-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2"; @@ -168,7 +180,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-100dpi-1.0.3"; + pname = "font-bh-100dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2"; @@ -182,7 +195,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-75dpi-1.0.3"; + pname = "font-bh-75dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2"; @@ -196,7 +210,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-lucidatypewriter-100dpi-1.0.3"; + pname = "font-bh-lucidatypewriter-100dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"; @@ -210,7 +225,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-lucidatypewriter-75dpi-1.0.3"; + pname = "font-bh-lucidatypewriter-75dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"; @@ -224,7 +240,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-ttf-1.0.3"; + pname = "font-bh-ttf"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2"; @@ -238,7 +255,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-type1-1.0.3"; + pname = "font-bh-type1"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2"; @@ -252,7 +270,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-bitstream-100dpi-1.0.3"; + pname = "font-bitstream-100dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2"; @@ -266,7 +285,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-bitstream-75dpi-1.0.3"; + pname = "font-bitstream-75dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2"; @@ -280,7 +300,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-bitstream-type1-1.0.3"; + pname = "font-bitstream-type1"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2"; @@ -294,7 +315,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-cronyx-cyrillic-1.0.3"; + pname = "font-cronyx-cyrillic"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2"; @@ -308,7 +330,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-cursor-misc-1.0.3"; + pname = "font-cursor-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2"; @@ -322,7 +345,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-daewoo-misc-1.0.3"; + pname = "font-daewoo-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2"; @@ -336,7 +360,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-dec-misc-1.0.3"; + pname = "font-dec-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2"; @@ -350,7 +375,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-ibm-type1-1.0.3"; + pname = "font-ibm-type1"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2"; @@ -364,7 +390,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-isas-misc-1.0.3"; + pname = "font-isas-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2"; @@ -378,7 +405,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-jis-misc-1.0.3"; + pname = "font-jis-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2"; @@ -392,7 +420,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-micro-misc-1.0.3"; + pname = "font-micro-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2"; @@ -406,7 +435,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-cyrillic-1.0.3"; + pname = "font-misc-cyrillic"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2"; @@ -420,7 +450,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-ethiopic-1.0.3"; + pname = "font-misc-ethiopic"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2"; @@ -434,7 +465,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-meltho-1.0.3"; + pname = "font-misc-meltho"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2"; @@ -448,7 +480,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-misc-1.1.2"; + pname = "font-misc-misc"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2"; @@ -462,7 +495,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-mutt-misc-1.0.3"; + pname = "font-mutt-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2"; @@ -476,7 +510,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-schumacher-misc-1.1.2"; + pname = "font-schumacher-misc"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2"; @@ -490,7 +525,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-screen-cyrillic-1.0.4"; + pname = "font-screen-cyrillic"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2"; @@ -504,7 +540,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-sony-misc-1.0.3"; + pname = "font-sony-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2"; @@ -518,7 +555,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-sun-misc-1.0.3"; + pname = "font-sun-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2"; @@ -532,7 +570,8 @@ lib.makeScope newScope (self: with self; { }) {}; fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { - name = "fonttosfnt-1.2.1"; + pname = "fonttosfnt"; + version = "1.2.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2"; @@ -545,7 +584,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "font-util-1.3.1"; + pname = "font-util"; + version = "1.3.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-util-1.3.1.tar.bz2"; @@ -558,7 +598,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-winitzki-cyrillic-1.0.3"; + pname = "font-winitzki-cyrillic"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2"; @@ -572,7 +613,8 @@ lib.makeScope newScope (self: with self; { }) {}; fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-xfree86-type1-1.0.4"; + pname = "font-xfree86-type1"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2"; @@ -586,7 +628,8 @@ lib.makeScope newScope (self: with self; { }) {}; gccmakedep = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "gccmakedep-1.0.3"; + pname = "gccmakedep"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2"; @@ -599,7 +642,8 @@ lib.makeScope newScope (self: with self; { }) {}; iceauth = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { - name = "iceauth-1.0.8"; + pname = "iceauth"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2"; @@ -612,7 +656,8 @@ lib.makeScope newScope (self: with self; { }) {}; ico = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "ico-1.0.5"; + pname = "ico"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/ico-1.0.5.tar.bz2"; @@ -625,7 +670,8 @@ lib.makeScope newScope (self: with self; { }) {}; imake = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "imake-1.0.8"; + pname = "imake"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/imake-1.0.8.tar.bz2"; @@ -638,7 +684,8 @@ lib.makeScope newScope (self: with self; { }) {}; libAppleWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libAppleWM-1.4.1"; + pname = "libAppleWM"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2"; @@ -651,7 +698,8 @@ lib.makeScope newScope (self: with self; { }) {}; libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libFS-1.0.8"; + pname = "libFS"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2"; @@ -664,7 +712,8 @@ lib.makeScope newScope (self: with self; { }) {}; libICE = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libICE-1.0.10"; + pname = "libICE"; + version = "1.0.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2"; @@ -677,7 +726,8 @@ lib.makeScope newScope (self: with self; { }) {}; libSM = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libSM-1.2.3"; + pname = "libSM"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2"; @@ -690,7 +740,8 @@ lib.makeScope newScope (self: with self; { }) {}; libWindowsWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libWindowsWM-1.0.1"; + pname = "libWindowsWM"; + version = "1.0.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2"; @@ -703,7 +754,8 @@ lib.makeScope newScope (self: with self; { }) {}; libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { - name = "libX11-1.7.2"; + pname = "libX11"; + version = "1.7.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libX11-1.7.2.tar.bz2"; @@ -716,7 +768,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXScrnSaver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXScrnSaver-1.2.3"; + pname = "libXScrnSaver"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2"; @@ -729,7 +782,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXTrap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { - name = "libXTrap-1.0.1"; + pname = "libXTrap"; + version = "1.0.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2"; @@ -742,7 +796,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXau-1.0.9"; + pname = "libXau"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2"; @@ -755,7 +810,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXaw = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { - name = "libXaw-1.0.14"; + pname = "libXaw"; + version = "1.0.14"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2"; @@ -768,7 +824,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXaw3d = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { - name = "libXaw3d-1.6.3"; + pname = "libXaw3d"; + version = "1.6.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2"; @@ -781,7 +838,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXcomposite = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXcomposite-0.4.5"; + pname = "libXcomposite"; + version = "0.4.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2"; @@ -794,7 +852,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { - name = "libXcursor-1.2.0"; + pname = "libXcursor"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2"; @@ -807,7 +866,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXdamage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXdamage-1.1.5"; + pname = "libXdamage"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2"; @@ -820,7 +880,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXdmcp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXdmcp-1.1.3"; + pname = "libXdmcp"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2"; @@ -833,7 +894,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXext = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "libXext-1.3.4"; + pname = "libXext"; + version = "1.3.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2"; @@ -846,7 +908,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXfixes = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libXfixes-6.0.0"; + pname = "libXfixes"; + version = "6.0.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2"; @@ -859,7 +922,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXfont = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { - name = "libXfont-1.5.4"; + pname = "libXfont"; + version = "1.5.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2"; @@ -872,7 +936,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { - name = "libXfont2-2.0.4"; + pname = "libXfont2"; + version = "2.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2"; @@ -885,7 +950,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { - name = "libXft-2.3.3"; + pname = "libXft"; + version = "2.3.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; @@ -898,7 +964,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { - name = "libXi-1.7.10"; + pname = "libXi"; + version = "1.7.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2"; @@ -911,7 +978,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXinerama = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXinerama-1.1.4"; + pname = "libXinerama"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2"; @@ -924,7 +992,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXmu = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { - name = "libXmu-1.1.3"; + pname = "libXmu"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2"; @@ -937,7 +1006,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { - name = "libXp-1.0.3"; + pname = "libXp"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2"; @@ -950,7 +1020,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { - name = "libXpm-3.5.13"; + pname = "libXpm"; + version = "3.5.13"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2"; @@ -963,7 +1034,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXpresent = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libXpresent-1.0.0"; + pname = "libXpresent"; + version = "1.0.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2"; @@ -976,7 +1048,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { - name = "libXrandr-1.5.2"; + pname = "libXrandr"; + version = "1.5.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2"; @@ -989,7 +1062,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXrender = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libXrender-0.9.10"; + pname = "libXrender"; + version = "0.9.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2"; @@ -1002,7 +1076,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXres = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXres-1.2.1"; + pname = "libXres"; + version = "1.2.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXres-1.2.1.tar.bz2"; @@ -1015,7 +1090,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { - name = "libXt-1.2.1"; + pname = "libXt"; + version = "1.2.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2"; @@ -1028,7 +1104,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXtst = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { - name = "libXtst-1.2.3"; + pname = "libXtst"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2"; @@ -1041,7 +1118,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXv-1.0.11"; + pname = "libXv"; + version = "1.0.11"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2"; @@ -1054,7 +1132,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXvMC = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { - name = "libXvMC-1.0.12"; + pname = "libXvMC"; + version = "1.0.12"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2"; @@ -1067,7 +1146,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXxf86dga = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86dga-1.1.5"; + pname = "libXxf86dga"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2"; @@ -1080,7 +1160,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXxf86misc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86misc-1.0.4"; + pname = "libXxf86misc"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2"; @@ -1093,7 +1174,8 @@ lib.makeScope newScope (self: with self; { }) {}; libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86vm-1.1.4"; + pname = "libXxf86vm"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2"; @@ -1106,7 +1188,8 @@ lib.makeScope newScope (self: with self; { }) {}; libdmx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libdmx-1.1.4"; + pname = "libdmx"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2"; @@ -1119,7 +1202,8 @@ lib.makeScope newScope (self: with self; { }) {}; libfontenc = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { - name = "libfontenc-1.1.4"; + pname = "libfontenc"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2"; @@ -1132,7 +1216,8 @@ lib.makeScope newScope (self: with self; { }) {}; libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, zlib }: stdenv.mkDerivation { - name = "libpciaccess-0.16"; + pname = "libpciaccess"; + version = "0.16"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2"; @@ -1145,7 +1230,8 @@ lib.makeScope newScope (self: with self; { }) {}; libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "libpthread-stubs-0.4"; + pname = "libpthread-stubs"; + version = "0.4"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2"; @@ -1158,7 +1244,8 @@ lib.makeScope newScope (self: with self; { }) {}; libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { - name = "libxcb-1.14"; + pname = "libxcb"; + version = "1.14"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz"; @@ -1171,7 +1258,8 @@ lib.makeScope newScope (self: with self; { }) {}; libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libxkbfile-1.1.0"; + pname = "libxkbfile"; + version = "1.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2"; @@ -1184,7 +1272,8 @@ lib.makeScope newScope (self: with self; { }) {}; libxshmfence = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libxshmfence-1.3"; + pname = "libxshmfence"; + version = "1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; @@ -1197,7 +1286,8 @@ lib.makeScope newScope (self: with self; { }) {}; listres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "listres-1.0.4"; + pname = "listres"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/listres-1.0.4.tar.bz2"; @@ -1210,7 +1300,8 @@ lib.makeScope newScope (self: with self; { }) {}; lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "lndir-1.0.3"; + pname = "lndir"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2"; @@ -1223,7 +1314,8 @@ lib.makeScope newScope (self: with self; { }) {}; luit = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "luit-20190106"; + pname = "luit"; + version = "20190106"; builder = ./builder.sh; src = fetchurl { url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; @@ -1236,7 +1328,8 @@ lib.makeScope newScope (self: with self; { }) {}; makedepend = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "makedepend-1.0.6"; + pname = "makedepend"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2"; @@ -1249,7 +1342,8 @@ lib.makeScope newScope (self: with self; { }) {}; mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { - name = "mkfontscale-1.2.1"; + pname = "mkfontscale"; + version = "1.2.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2"; @@ -1262,7 +1356,8 @@ lib.makeScope newScope (self: with self; { }) {}; oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { - name = "oclock-1.0.4"; + pname = "oclock"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/oclock-1.0.4.tar.bz2"; @@ -1275,7 +1370,8 @@ lib.makeScope newScope (self: with self; { }) {}; sessreg = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "sessreg-1.1.2"; + pname = "sessreg"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2"; @@ -1288,7 +1384,8 @@ lib.makeScope newScope (self: with self; { }) {}; setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { - name = "setxkbmap-1.3.2"; + pname = "setxkbmap"; + version = "1.3.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2"; @@ -1301,7 +1398,8 @@ lib.makeScope newScope (self: with self; { }) {}; smproxy = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { - name = "smproxy-1.0.6"; + pname = "smproxy"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2"; @@ -1314,7 +1412,8 @@ lib.makeScope newScope (self: with self; { }) {}; transset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "transset-1.0.2"; + pname = "transset"; + version = "1.0.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/transset-1.0.2.tar.bz2"; @@ -1327,7 +1426,8 @@ lib.makeScope newScope (self: with self; { }) {}; twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "twm-1.0.10"; + pname = "twm"; + version = "1.0.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/twm-1.0.10.tar.bz2"; @@ -1340,7 +1440,8 @@ lib.makeScope newScope (self: with self; { }) {}; utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "util-macros-1.19.3"; + pname = "util-macros"; + version = "1.19.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2"; @@ -1353,7 +1454,8 @@ lib.makeScope newScope (self: with self; { }) {}; viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { - name = "viewres-1.0.5"; + pname = "viewres"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/viewres-1.0.5.tar.bz2"; @@ -1366,7 +1468,8 @@ lib.makeScope newScope (self: with self; { }) {}; x11perf = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { - name = "x11perf-1.6.1"; + pname = "x11perf"; + version = "1.6.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; @@ -1379,7 +1482,8 @@ lib.makeScope newScope (self: with self; { }) {}; xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xauth-1.1"; + pname = "xauth"; + version = "1.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2"; @@ -1392,7 +1496,8 @@ lib.makeScope newScope (self: with self; { }) {}; xbacklight = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { - name = "xbacklight-1.2.3"; + pname = "xbacklight"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2"; @@ -1405,7 +1510,8 @@ lib.makeScope newScope (self: with self; { }) {}; xbitmaps = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xbitmaps-1.1.2"; + pname = "xbitmaps"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2"; @@ -1418,7 +1524,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { - name = "xcalc-1.1.0"; + pname = "xcalc"; + version = "1.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2"; @@ -1431,7 +1538,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { - name = "xcb-proto-1.14.1"; + pname = "xcb-proto"; + version = "1.14.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz"; @@ -1444,7 +1552,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcbutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-0.4.0"; + pname = "xcb-util"; + version = "0.4.0"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2"; @@ -1457,7 +1566,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-cursor-0.1.3"; + pname = "xcb-util-cursor"; + version = "0.1.3"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2"; @@ -1470,7 +1580,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcbutilerrors = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-errors-1.0"; + pname = "xcb-util-errors"; + version = "1.0"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2"; @@ -1483,7 +1594,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcbutilimage = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-image-0.4.0"; + pname = "xcb-util-image"; + version = "0.4.0"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2"; @@ -1496,7 +1608,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcbutilkeysyms = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-keysyms-0.4.0"; + pname = "xcb-util-keysyms"; + version = "0.4.0"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2"; @@ -1509,7 +1622,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcbutilrenderutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-renderutil-0.3.9"; + pname = "xcb-util-renderutil"; + version = "0.3.9"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2"; @@ -1522,7 +1636,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcbutilwm = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-wm-0.4.1"; + pname = "xcb-util-wm"; + version = "0.4.1"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2"; @@ -1535,7 +1650,8 @@ lib.makeScope newScope (self: with self; { }) {}; xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xclock-1.0.9"; + pname = "xclock"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xclock-1.0.9.tar.bz2"; @@ -1548,7 +1664,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { - name = "xcmsdb-1.0.5"; + pname = "xcmsdb"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2"; @@ -1561,7 +1678,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { - name = "xcompmgr-1.1.8"; + pname = "xcompmgr"; + version = "1.1.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2"; @@ -1574,7 +1692,8 @@ lib.makeScope newScope (self: with self; { }) {}; xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "xconsole-1.0.7"; + pname = "xconsole"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2"; @@ -1587,7 +1706,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { - name = "xcursorgen-1.0.7"; + pname = "xcursorgen"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2"; @@ -1600,7 +1720,8 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorthemes = callPackage ({ stdenv, pkg-config, fetchurl, libXcursor }: stdenv.mkDerivation { - name = "xcursor-themes-1.0.6"; + pname = "xcursor-themes"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2"; @@ -1613,7 +1734,8 @@ lib.makeScope newScope (self: with self; { }) {}; xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xdm-1.1.12"; + pname = "xdm"; + version = "1.1.12"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xdm-1.1.12.tar.bz2"; @@ -1626,7 +1748,8 @@ lib.makeScope newScope (self: with self; { }) {}; xdpyinfo = callPackage ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { - name = "xdpyinfo-1.3.2"; + pname = "xdpyinfo"; + version = "1.3.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2"; @@ -1639,7 +1762,8 @@ lib.makeScope newScope (self: with self; { }) {}; xdriinfo = callPackage ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { - name = "xdriinfo-1.0.6"; + pname = "xdriinfo"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2"; @@ -1652,7 +1776,8 @@ lib.makeScope newScope (self: with self; { }) {}; xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { - name = "xev-1.2.3"; + pname = "xev"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xev-1.2.3.tar.bz2"; @@ -1665,7 +1790,8 @@ lib.makeScope newScope (self: with self; { }) {}; xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xeyes-1.1.2"; + pname = "xeyes"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2"; @@ -1678,7 +1804,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-evdev-2.10.6"; + pname = "xf86-input-evdev"; + version = "2.10.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2"; @@ -1691,7 +1818,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputjoystick = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-joystick-1.6.3"; + pname = "xf86-input-joystick"; + version = "1.6.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2"; @@ -1704,7 +1832,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputkeyboard = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-keyboard-1.9.0"; + pname = "xf86-input-keyboard"; + version = "1.9.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2"; @@ -1717,7 +1846,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-libinput-1.0.1"; + pname = "xf86-input-libinput"; + version = "1.0.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2"; @@ -1730,7 +1860,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-mouse-1.9.3"; + pname = "xf86-input-mouse"; + version = "1.9.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2"; @@ -1743,7 +1874,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputsynaptics = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { - name = "xf86-input-synaptics-1.9.1"; + pname = "xf86-input-synaptics"; + version = "1.9.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2"; @@ -1756,7 +1888,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputvmmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-vmmouse-13.1.0"; + pname = "xf86-input-vmmouse"; + version = "13.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2"; @@ -1769,7 +1902,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputvoid = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { - name = "xf86-input-void-1.4.1"; + pname = "xf86-input-void"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2"; @@ -1782,7 +1916,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-amdgpu-19.1.0"; + pname = "xf86-video-amdgpu"; + version = "19.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-amdgpu-19.1.0.tar.bz2"; @@ -1795,7 +1930,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoapm = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-apm-1.3.0"; + pname = "xf86-video-apm"; + version = "1.3.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2"; @@ -1808,7 +1944,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoark = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ark-0.7.5"; + pname = "xf86-video-ark"; + version = "0.7.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2"; @@ -1821,7 +1958,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoast = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ast-1.1.5"; + pname = "xf86-video-ast"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2"; @@ -1834,7 +1972,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ati-19.1.0"; + pname = "xf86-video-ati"; + version = "19.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-ati-19.1.0.tar.bz2"; @@ -1847,7 +1986,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videochips = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-chips-1.4.0"; + pname = "xf86-video-chips"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2"; @@ -1860,7 +2000,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videocirrus = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-cirrus-1.5.3"; + pname = "xf86-video-cirrus"; + version = "1.5.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2"; @@ -1873,7 +2014,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videodummy = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-dummy-0.3.8"; + pname = "xf86-video-dummy"; + version = "0.3.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2"; @@ -1886,7 +2028,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videofbdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-fbdev-0.5.0"; + pname = "xf86-video-fbdev"; + version = "0.5.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2"; @@ -1899,7 +2042,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videogeode = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-geode-2.11.19"; + pname = "xf86-video-geode"; + version = "2.11.19"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2"; @@ -1912,7 +2056,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoglide = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-glide-1.2.2"; + pname = "xf86-video-glide"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2"; @@ -1925,7 +2070,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoglint = callPackage ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-glint-1.2.9"; + pname = "xf86-video-glint"; + version = "1.2.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; @@ -1938,7 +2084,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoi128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-i128-1.4.0"; + pname = "xf86-video-i128"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2"; @@ -1951,7 +2098,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoi740 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-i740-1.4.0"; + pname = "xf86-video-i740"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2"; @@ -1964,7 +2112,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videointel = callPackage ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { - name = "xf86-video-intel-2.99.917"; + pname = "xf86-video-intel"; + version = "2.99.917"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2"; @@ -1977,7 +2126,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-mach64-6.9.6"; + pname = "xf86-video-mach64"; + version = "6.9.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; @@ -1990,7 +2140,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-mga-2.0.0"; + pname = "xf86-video-mga"; + version = "2.0.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2"; @@ -2003,7 +2154,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoneomagic = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-neomagic-1.3.0"; + pname = "xf86-video-neomagic"; + version = "1.3.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2"; @@ -2016,7 +2168,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videonewport = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-newport-0.2.4"; + pname = "xf86-video-newport"; + version = "0.2.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2"; @@ -2029,7 +2182,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-nouveau-1.0.17"; + pname = "xf86-video-nouveau"; + version = "1.0.17"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2"; @@ -2042,7 +2196,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videonv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-nv-2.1.21"; + pname = "xf86-video-nv"; + version = "2.1.21"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2"; @@ -2055,7 +2210,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoomap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-omap-0.4.5"; + pname = "xf86-video-omap"; + version = "0.4.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2"; @@ -2068,7 +2224,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoopenchrome = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { - name = "xf86-video-openchrome-0.6.0"; + pname = "xf86-video-openchrome"; + version = "0.6.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2"; @@ -2081,7 +2238,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoqxl = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-qxl-0.1.5"; + pname = "xf86-video-qxl"; + version = "0.1.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2"; @@ -2094,7 +2252,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-r128-6.11.0"; + pname = "xf86-video-r128"; + version = "6.11.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2"; @@ -2107,7 +2266,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videorendition = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-rendition-4.2.7"; + pname = "xf86-video-rendition"; + version = "4.2.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2"; @@ -2120,7 +2280,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videos3virge = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-s3virge-1.11.0"; + pname = "xf86-video-s3virge"; + version = "1.11.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2"; @@ -2133,7 +2294,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videosavage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-savage-2.3.9"; + pname = "xf86-video-savage"; + version = "2.3.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2"; @@ -2146,7 +2308,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-siliconmotion-1.7.9"; + pname = "xf86-video-siliconmotion"; + version = "1.7.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2"; @@ -2159,7 +2322,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videosis = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sis-0.11.0"; + pname = "xf86-video-sis"; + version = "0.11.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2"; @@ -2172,7 +2336,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videosisusb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sisusb-0.9.7"; + pname = "xf86-video-sisusb"; + version = "0.9.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2"; @@ -2185,7 +2350,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videosuncg6 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-suncg6-1.1.2"; + pname = "xf86-video-suncg6"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2"; @@ -2198,7 +2364,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sunffb-1.2.2"; + pname = "xf86-video-sunffb"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2"; @@ -2211,7 +2378,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sunleo-1.2.2"; + pname = "xf86-video-sunleo"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2"; @@ -2224,7 +2392,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videotdfx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tdfx-1.5.0"; + pname = "xf86-video-tdfx"; + version = "1.5.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2"; @@ -2237,7 +2406,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videotga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tga-1.2.2"; + pname = "xf86-video-tga"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2"; @@ -2250,7 +2420,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-trident-1.3.8"; + pname = "xf86-video-trident"; + version = "1.3.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2"; @@ -2263,7 +2434,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videov4l = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-v4l-0.3.0"; + pname = "xf86-video-v4l"; + version = "0.3.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; @@ -2276,7 +2448,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videovboxvideo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vboxvideo-1.0.0"; + pname = "xf86-video-vboxvideo"; + version = "1.0.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2"; @@ -2289,7 +2462,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videovesa = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vesa-2.5.0"; + pname = "xf86-video-vesa"; + version = "2.5.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2"; @@ -2302,7 +2476,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videovmware = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vmware-13.3.0"; + pname = "xf86-video-vmware"; + version = "13.3.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2"; @@ -2315,7 +2490,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videovoodoo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-voodoo-1.2.5"; + pname = "xf86-video-voodoo"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2"; @@ -2328,7 +2504,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videowsfb = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { - name = "xf86-video-wsfb-0.4.0"; + pname = "xf86-video-wsfb"; + version = "0.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2"; @@ -2341,7 +2518,8 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoxgi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-xgi-1.6.1"; + pname = "xf86-video-xgi"; + version = "1.6.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2"; @@ -2354,7 +2532,8 @@ lib.makeScope newScope (self: with self; { }) {}; xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { - name = "xfd-1.1.3"; + pname = "xfd"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xfd-1.1.3.tar.bz2"; @@ -2367,7 +2546,8 @@ lib.makeScope newScope (self: with self; { }) {}; xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { - name = "xfontsel-1.0.6"; + pname = "xfontsel"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2"; @@ -2380,7 +2560,8 @@ lib.makeScope newScope (self: with self; { }) {}; xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { - name = "xfs-1.2.0"; + pname = "xfs"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xfs-1.2.0.tar.bz2"; @@ -2393,7 +2574,8 @@ lib.makeScope newScope (self: with self; { }) {}; xfsinfo = callPackage ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { - name = "xfsinfo-1.0.6"; + pname = "xfsinfo"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2"; @@ -2406,7 +2588,8 @@ lib.makeScope newScope (self: with self; { }) {}; xgamma = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { - name = "xgamma-1.0.6"; + pname = "xgamma"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2"; @@ -2419,7 +2602,8 @@ lib.makeScope newScope (self: with self; { }) {}; xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xgc-1.0.5"; + pname = "xgc"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xgc-1.0.5.tar.bz2"; @@ -2432,7 +2616,8 @@ lib.makeScope newScope (self: with self; { }) {}; xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xhost-1.0.8"; + pname = "xhost"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2"; @@ -2445,7 +2630,8 @@ lib.makeScope newScope (self: with self; { }) {}; xinit = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xinit-1.4.1"; + pname = "xinit"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xinit-1.4.1.tar.bz2"; @@ -2458,7 +2644,8 @@ lib.makeScope newScope (self: with self; { }) {}; xinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { - name = "xinput-1.6.3"; + pname = "xinput"; + version = "1.6.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xinput-1.6.3.tar.bz2"; @@ -2471,7 +2658,8 @@ lib.makeScope newScope (self: with self; { }) {}; xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { - name = "xkbcomp-1.4.5"; + pname = "xkbcomp"; + version = "1.4.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2"; @@ -2484,7 +2672,8 @@ lib.makeScope newScope (self: with self; { }) {}; xkbevd = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { - name = "xkbevd-1.1.4"; + pname = "xkbevd"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2"; @@ -2497,7 +2686,8 @@ lib.makeScope newScope (self: with self; { }) {}; xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { - name = "xkbprint-1.0.4"; + pname = "xkbprint"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2"; @@ -2510,7 +2700,8 @@ lib.makeScope newScope (self: with self; { }) {}; xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { - name = "xkbutils-1.0.4"; + pname = "xkbutils"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2"; @@ -2523,7 +2714,8 @@ lib.makeScope newScope (self: with self; { }) {}; xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { - name = "xkeyboard-config-2.33"; + pname = "xkeyboard-config"; + version = "2.33"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.33.tar.bz2"; @@ -2536,7 +2728,8 @@ lib.makeScope newScope (self: with self; { }) {}; xkill = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xkill-1.0.5"; + pname = "xkill"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkill-1.0.5.tar.bz2"; @@ -2549,7 +2742,8 @@ lib.makeScope newScope (self: with self; { }) {}; xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { - name = "xload-1.1.3"; + pname = "xload"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xload-1.1.3.tar.bz2"; @@ -2562,7 +2756,8 @@ lib.makeScope newScope (self: with self; { }) {}; xlsatoms = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsatoms-1.1.3"; + pname = "xlsatoms"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2"; @@ -2575,7 +2770,8 @@ lib.makeScope newScope (self: with self; { }) {}; xlsclients = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsclients-1.1.4"; + pname = "xlsclients"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2"; @@ -2588,7 +2784,8 @@ lib.makeScope newScope (self: with self; { }) {}; xlsfonts = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xlsfonts-1.0.6"; + pname = "xlsfonts"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2"; @@ -2601,7 +2798,8 @@ lib.makeScope newScope (self: with self; { }) {}; xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { - name = "xmag-1.0.6"; + pname = "xmag"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xmag-1.0.6.tar.bz2"; @@ -2614,7 +2812,8 @@ lib.makeScope newScope (self: with self; { }) {}; xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xmessage-1.0.5"; + pname = "xmessage"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2"; @@ -2627,7 +2826,8 @@ lib.makeScope newScope (self: with self; { }) {}; xmodmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xmodmap-1.0.10"; + pname = "xmodmap"; + version = "1.0.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2"; @@ -2640,7 +2840,8 @@ lib.makeScope newScope (self: with self; { }) {}; xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xmore-1.0.3"; + pname = "xmore"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xmore-1.0.3.tar.bz2"; @@ -2653,7 +2854,8 @@ lib.makeScope newScope (self: with self; { }) {}; xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xorg-cf-files-1.0.6"; + pname = "xorg-cf-files"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2"; @@ -2666,7 +2868,8 @@ lib.makeScope newScope (self: with self; { }) {}; xorgdocs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xorg-docs-1.7.1"; + pname = "xorg-docs"; + version = "1.7.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2"; @@ -2679,7 +2882,8 @@ lib.makeScope newScope (self: with self; { }) {}; xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt, python3 }: stdenv.mkDerivation { - name = "xorgproto-2021.4"; + pname = "xorgproto"; + version = "2021.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/proto/xorgproto-2021.4.tar.bz2"; @@ -2692,7 +2896,8 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.11"; + pname = "xorg-server"; + version = "1.20.11"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2"; @@ -2705,7 +2910,8 @@ lib.makeScope newScope (self: with self; { }) {}; xorgsgmldoctools = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xorg-sgml-doctools-1.11"; + pname = "xorg-sgml-doctools"; + version = "1.11"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2"; @@ -2718,7 +2924,8 @@ lib.makeScope newScope (self: with self; { }) {}; xpr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xpr-1.0.5"; + pname = "xpr"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xpr-1.0.5.tar.bz2"; @@ -2731,7 +2938,8 @@ lib.makeScope newScope (self: with self; { }) {}; xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xprop-1.2.5"; + pname = "xprop"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2"; @@ -2744,7 +2952,8 @@ lib.makeScope newScope (self: with self; { }) {}; xrandr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { - name = "xrandr-1.5.1"; + pname = "xrandr"; + version = "1.5.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xrandr-1.5.1.tar.xz"; @@ -2757,7 +2966,8 @@ lib.makeScope newScope (self: with self; { }) {}; xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xrdb-1.2.0"; + pname = "xrdb"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2"; @@ -2770,7 +2980,8 @@ lib.makeScope newScope (self: with self; { }) {}; xrefresh = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xrefresh-1.0.6"; + pname = "xrefresh"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2"; @@ -2783,7 +2994,8 @@ lib.makeScope newScope (self: with self; { }) {}; xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { - name = "xset-1.2.4"; + pname = "xset"; + version = "1.2.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2"; @@ -2796,7 +3008,8 @@ lib.makeScope newScope (self: with self; { }) {}; xsetroot = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xsetroot-1.1.2"; + pname = "xsetroot"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2"; @@ -2809,7 +3022,8 @@ lib.makeScope newScope (self: with self; { }) {}; xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { - name = "xsm-1.0.4"; + pname = "xsm"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xsm-1.0.4.tar.bz2"; @@ -2822,7 +3036,8 @@ lib.makeScope newScope (self: with self; { }) {}; xstdcmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xstdcmap-1.0.4"; + pname = "xstdcmap"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2"; @@ -2835,7 +3050,8 @@ lib.makeScope newScope (self: with self; { }) {}; xtrans = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xtrans-1.4.0"; + pname = "xtrans"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2"; @@ -2848,7 +3064,8 @@ lib.makeScope newScope (self: with self; { }) {}; xtrap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { - name = "xtrap-1.0.3"; + pname = "xtrap"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2"; @@ -2861,7 +3078,8 @@ lib.makeScope newScope (self: with self; { }) {}; xvinfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { - name = "xvinfo-1.1.4"; + pname = "xvinfo"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2"; @@ -2874,7 +3092,8 @@ lib.makeScope newScope (self: with self; { }) {}; xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { - name = "xwd-1.0.7"; + pname = "xwd"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; @@ -2887,7 +3106,8 @@ lib.makeScope newScope (self: with self; { }) {}; xwininfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { - name = "xwininfo-1.1.4"; + pname = "xwininfo"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2"; @@ -2900,7 +3120,8 @@ lib.makeScope newScope (self: with self; { }) {}; xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xwud-1.0.5"; + pname = "xwud"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xwud-1.0.5.tar.bz2"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index b50f3f33a31..c349323dff5 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -17,6 +17,7 @@ use File::Temp; my %pkgURLs; my %pkgHashes; my %pkgNames; +my %pkgVersions; my %pkgRequires; my %pkgNativeRequires; @@ -73,8 +74,12 @@ while (<>) { next; } + # split by first occurence of hyphen followd by only numbers ends line or another hyphen follows + my ($name, $version) = split(/-(?=[.0-9]+(?:$|-))/, $pkgName, 2); + $pkgURLs{$pkg} = $tarball; - $pkgNames{$pkg} = $pkgName; + $pkgNames{$pkg} = $name; + $pkgVersions{$pkg} = $version; my $cachePath = catdir($downloadCache, basename($tarball)); my $hash; @@ -302,7 +307,8 @@ foreach my $pkg (sort (keys %pkgURLs)) { print OUT <<EOF $pkg = callPackage ({ $argumentsStr }: stdenv.mkDerivation { - name = "$pkgNames{$pkg}"; + pname = "$pkgNames{$pkg}"; + version = "$pkgVersions{$pkg}"; builder = ./builder.sh; src = fetchurl { url = "$pkgURLs{$pkg}"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1e6b9888ba2..1f123763a89 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -664,7 +664,7 @@ self: super: ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others cd "$dev" for f in include/xorg/*.h; do - sed "1i#line 1 \"${attrs.name}/$f\"" -i "$f" + sed "1i#line 1 \"${attrs.pname}-${attrs.version}/$f\"" -i "$f" done ) ''; |