libxcvt: refactor and move to pkgs/by-name from xorg namespace

Zitrone 5d7e0e35 c376a565

+54 -54
+50
pkgs/by-name/li/libxcvt/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + meson, 7 + ninja, 8 + writeScript, 9 + }: 10 + stdenv.mkDerivation (finalAttrs: { 11 + pname = "libxcvt"; 12 + version = "0.1.3"; 13 + 14 + src = fetchurl { 15 + url = "mirror://xorg/individual/lib/libxcvt-${finalAttrs.version}.tar.xz"; 16 + hash = "sha256-qSmZiodn3n36NtbaR1HNvu807WMHFPL0p2ezUfJELgE="; 17 + }; 18 + 19 + strictDeps = true; 20 + 21 + nativeBuildInputs = [ 22 + pkg-config 23 + meson 24 + ninja 25 + ]; 26 + 27 + passthru = { 28 + updateScript = writeScript "update-${finalAttrs.pname}" '' 29 + #!/usr/bin/env nix-shell 30 + #!nix-shell -i bash -p common-updater-scripts 31 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 32 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 33 + | sort -V | tail -n1)" 34 + update-source-version ${finalAttrs.pname} "$version" 35 + ''; 36 + }; 37 + 38 + meta = { 39 + description = "VESA CVT standard timing modeline generation library & utility"; 40 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcvt"; 41 + license = with lib.licenses; [ 42 + mit 43 + hpndSellVariant 44 + ]; 45 + mainProgram = "cvt"; 46 + maintainers = [ ]; 47 + platforms = lib.platforms.unix; 48 + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; 49 + }; 50 + })
+2 -37
pkgs/servers/x11/xorg/default.nix
··· 6 gccmakedep, 7 libpciaccess, 8 libpthread-stubs, 9 luit, 10 pixman, 11 }: ··· 15 inherit 16 gccmakedep 17 libpciaccess 18 luit 19 pixman 20 ; ··· 3272 "xcb-xv" 3273 "xcb-xvmc" 3274 ]; 3275 - platforms = lib.platforms.unix; 3276 - }; 3277 - }) 3278 - ) { }; 3279 - 3280 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3281 - libxcvt = callPackage ( 3282 - { 3283 - stdenv, 3284 - pkg-config, 3285 - fetchurl, 3286 - meson, 3287 - ninja, 3288 - testers, 3289 - }: 3290 - stdenv.mkDerivation (finalAttrs: { 3291 - pname = "libxcvt"; 3292 - version = "0.1.3"; 3293 - builder = ./builder.sh; 3294 - src = fetchurl { 3295 - url = "mirror://xorg/individual/lib/libxcvt-0.1.3.tar.xz"; 3296 - sha256 = "009f8kr53cv7lzsg4507cgnk9vxyrm8lgnnn6vx7vpk7hy59jad9"; 3297 - }; 3298 - hardeningDisable = [ 3299 - "bindnow" 3300 - "relro" 3301 - ]; 3302 - strictDeps = true; 3303 - nativeBuildInputs = [ 3304 - pkg-config 3305 - meson 3306 - ninja 3307 - ]; 3308 - buildInputs = [ ]; 3309 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3310 - meta = { 3311 - pkgConfigModules = [ ]; 3312 platforms = lib.platforms.unix; 3313 }; 3314 })
··· 6 gccmakedep, 7 libpciaccess, 8 libpthread-stubs, 9 + libxcvt, 10 luit, 11 pixman, 12 }: ··· 16 inherit 17 gccmakedep 18 libpciaccess 19 + libxcvt 20 luit 21 pixman 22 ; ··· 3274 "xcb-xv" 3275 "xcb-xvmc" 3276 ]; 3277 platforms = lib.platforms.unix; 3278 }; 3279 })
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 268 gccmakedep, 269 libpciaccess, 270 libpthread-stubs, 271 luit, 272 pixman, 273 }: ··· 277 inherit 278 gccmakedep 279 libpciaccess 280 luit 281 pixman 282 ;
··· 268 gccmakedep, 269 libpciaccess, 270 libpthread-stubs, 271 + libxcvt, 272 luit, 273 pixman, 274 }: ··· 278 inherit 279 gccmakedep 280 libpciaccess 281 + libxcvt 282 luit 283 pixman 284 ;
-16
pkgs/servers/x11/xorg/overrides.nix
··· 227 }; 228 }); 229 230 - libxcvt = super.libxcvt.overrideAttrs ( 231 - { 232 - meta ? { }, 233 - ... 234 - }: 235 - { 236 - meta = meta // { 237 - homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcvt"; 238 - mainProgram = "cvt"; 239 - badPlatforms = meta.badPlatforms or [ ] ++ [ 240 - lib.systems.inspect.platformPatterns.isStatic 241 - ]; 242 - }; 243 - } 244 - ); 245 - 246 libX11 = super.libX11.overrideAttrs (attrs: { 247 outputs = [ 248 "out"
··· 227 }; 228 }); 229 230 libX11 = super.libX11.overrideAttrs (attrs: { 231 outputs = [ 232 "out"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 174 mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz 175 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz 176 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz 177 - mirror://xorg/individual/lib/libxcvt-0.1.3.tar.xz 178 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz 179 mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz 180 mirror://xorg/individual/lib/libXext-1.3.6.tar.xz
··· 174 mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz 175 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz 176 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz 177 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz 178 mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz 179 mirror://xorg/individual/lib/libXext-1.3.6.tar.xz