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

Zitrone b9625e34 5d7e0e35

+47 -33
+43
pkgs/by-name/ma/makedepend/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + writeScript, 7 + }: 8 + stdenv.mkDerivation (finalAttrs: { 9 + pname = "makedepend"; 10 + version = "1.0.9"; 11 + 12 + src = fetchurl { 13 + url = "mirror://xorg/individual/util/makedepend-${finalAttrs.version}.tar.xz"; 14 + hash = "sha256-ktDetln/9tjdvB0n/EyozrK22+Fdc/CgTtwJ8cV4LdQ="; 15 + }; 16 + 17 + strictDeps = true; 18 + 19 + nativeBuildInputs = [ pkg-config ]; 20 + 21 + passthru = { 22 + updateScript = writeScript "update-${finalAttrs.pname}" '' 23 + #!/usr/bin/env nix-shell 24 + #!nix-shell -i bash -p common-updater-scripts 25 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 26 + --url https://xorg.freedesktop.org/releases/individual/util/ \ 27 + | sort -V | tail -n1)" 28 + update-source-version ${finalAttrs.pname} "$version" 29 + ''; 30 + }; 31 + 32 + meta = { 33 + description = "parse C sources to make dependency lists for Makefiles"; 34 + homepage = "https://gitlab.freedesktop.org/xorg/util/makedepend"; 35 + license = with lib.licenses; [ 36 + mitOpenGroup 37 + hpnd 38 + ]; 39 + mainProgram = "makedepend"; 40 + maintainers = [ ]; 41 + platforms = lib.platforms.unix; 42 + }; 43 + })
+2 -31
pkgs/servers/x11/xorg/default.nix
··· 8 libpthread-stubs, 9 libxcvt, 10 luit, 11 pixman, 12 }: 13 ··· 18 libpciaccess 19 libxcvt 20 luit 21 pixman 22 ; 23 fontalias = font-alias; ··· 3411 strictDeps = true; 3412 nativeBuildInputs = [ pkg-config ]; 3413 buildInputs = [ xorgproto ]; 3414 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3415 - meta = { 3416 - pkgConfigModules = [ ]; 3417 - platforms = lib.platforms.unix; 3418 - }; 3419 - }) 3420 - ) { }; 3421 - 3422 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3423 - makedepend = callPackage ( 3424 - { 3425 - stdenv, 3426 - pkg-config, 3427 - fetchurl, 3428 - testers, 3429 - }: 3430 - stdenv.mkDerivation (finalAttrs: { 3431 - pname = "makedepend"; 3432 - version = "1.0.9"; 3433 - builder = ./builder.sh; 3434 - src = fetchurl { 3435 - url = "mirror://xorg/individual/util/makedepend-1.0.9.tar.xz"; 3436 - sha256 = "1m1dg32z22fw9shg0wsxw7dvdcnfm16gq9qxpkfxixpzb6vdxl4j"; 3437 - }; 3438 - hardeningDisable = [ 3439 - "bindnow" 3440 - "relro" 3441 - ]; 3442 - strictDeps = true; 3443 - nativeBuildInputs = [ pkg-config ]; 3444 - buildInputs = [ ]; 3445 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3446 meta = { 3447 pkgConfigModules = [ ];
··· 8 libpthread-stubs, 9 libxcvt, 10 luit, 11 + makedepend, 12 pixman, 13 }: 14 ··· 19 libpciaccess 20 libxcvt 21 luit 22 + makedepend 23 pixman 24 ; 25 fontalias = font-alias; ··· 3413 strictDeps = true; 3414 nativeBuildInputs = [ pkg-config ]; 3415 buildInputs = [ xorgproto ]; 3416 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3417 meta = { 3418 pkgConfigModules = [ ];
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 270 libpthread-stubs, 271 libxcvt, 272 luit, 273 pixman, 274 }: 275 ··· 280 libpciaccess 281 libxcvt 282 luit 283 pixman 284 ; 285 fontalias = font-alias;
··· 270 libpthread-stubs, 271 libxcvt, 272 luit, 273 + makedepend, 274 pixman, 275 }: 276 ··· 281 libpciaccess 282 libxcvt 283 luit 284 + makedepend 285 pixman 286 ; 287 fontalias = font-alias;
-1
pkgs/servers/x11/xorg/overrides.nix
··· 613 }; 614 }); 615 616 - makedepend = addMainProgram super.makedepend { }; 617 mkfontscale = addMainProgram super.mkfontscale { }; 618 oclock = addMainProgram super.oclock { }; 619 smproxy = addMainProgram super.smproxy { };
··· 613 }; 614 }); 615 616 mkfontscale = addMainProgram super.mkfontscale { }; 617 oclock = addMainProgram super.oclock { }; 618 smproxy = addMainProgram super.smproxy { };
-1
pkgs/servers/x11/xorg/tarballs.list
··· 208 mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz 209 mirror://xorg/individual/util/imake-1.0.10.tar.xz 210 mirror://xorg/individual/util/lndir-1.0.5.tar.xz 211 - mirror://xorg/individual/util/makedepend-1.0.9.tar.xz 212 mirror://xorg/individual/util/util-macros-1.20.2.tar.xz 213 mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz 214 mirror://xorg/individual/xserver/xorg-server-21.1.16.tar.xz
··· 208 mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz 209 mirror://xorg/individual/util/imake-1.0.10.tar.xz 210 mirror://xorg/individual/util/lndir-1.0.5.tar.xz 211 mirror://xorg/individual/util/util-macros-1.20.2.tar.xz 212 mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz 213 mirror://xorg/individual/xserver/xorg-server-21.1.16.tar.xz