libice: refactor, move to pkgs/by-name and rename from xorg.libICE

+60 -45
+55
pkgs/by-name/li/libice/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + xtrans, 8 + writeScript, 9 + testers, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "libice"; 13 + version = "1.1.2"; 14 + 15 + outputs = [ 16 + "out" 17 + "dev" 18 + "doc" 19 + ]; 20 + 21 + src = fetchurl { 22 + url = "mirror://xorg/individual/lib/libICE-${finalAttrs.version}.tar.xz"; 23 + hash = "sha256-l05O1BQiXrPHFphd+XCfTajSKmeiiQBmvG38ia0phiU="; 24 + }; 25 + 26 + strictDeps = true; 27 + 28 + nativeBuildInputs = [ pkg-config ]; 29 + 30 + buildInputs = [ 31 + xorgproto 32 + xtrans 33 + ]; 34 + 35 + passthru = { 36 + updateScript = writeScript "update-${finalAttrs.pname}" '' 37 + #!/usr/bin/env nix-shell 38 + #!nix-shell -i bash -p common-updater-scripts 39 + version="$(list-directory-versions --pname libICE \ 40 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 41 + | sort -V | tail -n1)" 42 + update-source-version ${finalAttrs.pname} "$version" 43 + ''; 44 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 45 + }; 46 + 47 + meta = { 48 + description = "Inter-Client Exchange Library"; 49 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libice"; 50 + license = lib.licenses.mitOpenGroup; 51 + maintainers = [ ]; 52 + pkgConfigModules = [ "ice" ]; 53 + platforms = lib.platforms.unix; 54 + }; 55 + })
+2 -36
pkgs/servers/x11/xorg/default.nix
··· 11 libdmx, 12 libfontenc, 13 libfs, 14 libpciaccess, 15 libpthread-stubs, 16 libx11, ··· 89 fontutil = font-util; 90 libAppleWM = libapplewm; 91 libFS = libfs; 92 libpthreadstubs = libpthread-stubs; 93 libX11 = libx11; 94 libXau = libxau; ··· 1736 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1737 meta = { 1738 pkgConfigModules = [ ]; 1739 - platforms = lib.platforms.unix; 1740 - }; 1741 - }) 1742 - ) { }; 1743 - 1744 - # THIS IS A GENERATED FILE. DO NOT EDIT! 1745 - libICE = callPackage ( 1746 - { 1747 - stdenv, 1748 - pkg-config, 1749 - fetchurl, 1750 - xorgproto, 1751 - xtrans, 1752 - testers, 1753 - }: 1754 - stdenv.mkDerivation (finalAttrs: { 1755 - pname = "libICE"; 1756 - version = "1.1.2"; 1757 - builder = ./builder.sh; 1758 - src = fetchurl { 1759 - url = "mirror://xorg/individual/lib/libICE-1.1.2.tar.xz"; 1760 - sha256 = "09c656nqkz3dpik012d2cwmd5a2dkxqgjpcq2v3v6pi22ka4wklp"; 1761 - }; 1762 - hardeningDisable = [ 1763 - "bindnow" 1764 - "relro" 1765 - ]; 1766 - strictDeps = true; 1767 - nativeBuildInputs = [ pkg-config ]; 1768 - buildInputs = [ 1769 - xorgproto 1770 - xtrans 1771 - ]; 1772 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1773 - meta = { 1774 - pkgConfigModules = [ "ice" ]; 1775 platforms = lib.platforms.unix; 1776 }; 1777 })
··· 11 libdmx, 12 libfontenc, 13 libfs, 14 + libice, 15 libpciaccess, 16 libpthread-stubs, 17 libx11, ··· 90 fontutil = font-util; 91 libAppleWM = libapplewm; 92 libFS = libfs; 93 + libICE = libice; 94 libpthreadstubs = libpthread-stubs; 95 libX11 = libx11; 96 libXau = libxau; ··· 1738 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1739 meta = { 1740 pkgConfigModules = [ ]; 1741 platforms = lib.platforms.unix; 1742 }; 1743 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 39 $pcMap{"dmx"} = "libdmx"; 40 $pcMap{"fontenc"} = "libfontenc"; 41 $pcMap{"fontutil"} = "fontutil"; 42 $pcMap{"libfs"} = "libFS"; 43 $pcMap{"pciaccess"} = "libpciaccess"; 44 $pcMap{"pthread-stubs"} = "libpthreadstubs"; ··· 304 libdmx, 305 libfontenc, 306 libfs, 307 libpciaccess, 308 libpthread-stubs, 309 libx11, ··· 382 fontutil = font-util; 383 libAppleWM = libapplewm; 384 libFS = libfs; 385 libpthreadstubs = libpthread-stubs; 386 libX11 = libx11; 387 libXau = libxau;
··· 39 $pcMap{"dmx"} = "libdmx"; 40 $pcMap{"fontenc"} = "libfontenc"; 41 $pcMap{"fontutil"} = "fontutil"; 42 + $pcMap{"ice"} = "libICE"; 43 $pcMap{"libfs"} = "libFS"; 44 $pcMap{"pciaccess"} = "libpciaccess"; 45 $pcMap{"pthread-stubs"} = "libpthreadstubs"; ··· 305 libdmx, 306 libfontenc, 307 libfs, 308 + libice, 309 libpciaccess, 310 libpthread-stubs, 311 libx11, ··· 384 fontutil = font-util; 385 libAppleWM = libapplewm; 386 libFS = libfs; 387 + libICE = libice; 388 libpthreadstubs = libpthread-stubs; 389 libX11 = libx11; 390 libXau = libxau;
-8
pkgs/servers/x11/xorg/overrides.nix
··· 239 ]; 240 }); 241 242 - libICE = super.libICE.overrideAttrs (attrs: { 243 - outputs = [ 244 - "out" 245 - "dev" 246 - "doc" 247 - ]; 248 - }); 249 - 250 libXcomposite = super.libXcomposite.overrideAttrs (attrs: { 251 outputs = [ 252 "out"
··· 239 ]; 240 }); 241 242 libXcomposite = super.libXcomposite.overrideAttrs (attrs: { 243 outputs = [ 244 "out"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 141 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz 142 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz 143 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz 144 - mirror://xorg/individual/lib/libICE-1.1.2.tar.xz 145 mirror://xorg/individual/lib/libSM-1.2.6.tar.xz 146 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 147 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
··· 141 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz 142 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz 143 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz 144 mirror://xorg/individual/lib/libSM-1.2.6.tar.xz 145 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 146 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz