Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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

authored by Zitrone and committed by Alyssa Ross 5a40acda ae5f8586

+49 -40
+45
pkgs/by-name/se/sessreg/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + writeScript, 8 + }: 9 + stdenv.mkDerivation (finalAttrs: { 10 + pname = "sessreg"; 11 + version = "1.1.3"; 12 + 13 + src = fetchurl { 14 + url = "mirror://xorg/individual/app/sessreg-${finalAttrs.version}.tar.xz"; 15 + hash = "sha256-AirNXegHfd3E+RmWH3nhAuzV8yKKMzaBr1zQ5zRPrMI="; 16 + }; 17 + 18 + strictDeps = true; 19 + 20 + nativeBuildInputs = [ pkg-config ]; 21 + buildInputs = [ xorgproto ]; 22 + 23 + passthru = { 24 + updateScript = writeScript "update-${finalAttrs.pname}" '' 25 + #!/usr/bin/env nix-shell 26 + #!nix-shell -i bash -p common-updater-scripts 27 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 28 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 29 + | sort -V | tail -n1)" 30 + update-source-version ${finalAttrs.pname} "$version" 31 + ''; 32 + }; 33 + 34 + meta = { 35 + description = "Utility to manage utmp & wtmp entries for X sessions"; 36 + homepage = "https://gitlab.freedesktop.org/xorg/app/sessreg"; 37 + license = with lib.licenses; [ 38 + mitOpenGroup 39 + mit 40 + ]; 41 + mainProgram = "sessreg"; 42 + maintainers = [ ]; 43 + platforms = lib.platforms.unix; 44 + }; 45 + })
+2 -32
pkgs/servers/x11/xorg/default.nix
··· 13 13 luit, 14 14 makedepend, 15 15 pixman, 16 + sessreg, 16 17 util-macros, 17 18 xbitmaps, 18 19 xcb-proto, ··· 36 37 luit 37 38 makedepend 38 39 pixman 40 + sessreg 39 41 xbitmaps 40 42 xorgproto 41 43 xtrans ··· 3427 3429 libXmu 3428 3430 libXt 3429 3431 ]; 3430 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3431 - meta = { 3432 - pkgConfigModules = [ ]; 3433 - platforms = lib.platforms.unix; 3434 - }; 3435 - }) 3436 - ) { }; 3437 - 3438 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3439 - sessreg = callPackage ( 3440 - { 3441 - stdenv, 3442 - pkg-config, 3443 - fetchurl, 3444 - xorgproto, 3445 - testers, 3446 - }: 3447 - stdenv.mkDerivation (finalAttrs: { 3448 - pname = "sessreg"; 3449 - version = "1.1.3"; 3450 - builder = ./builder.sh; 3451 - src = fetchurl { 3452 - url = "mirror://xorg/individual/app/sessreg-1.1.3.tar.xz"; 3453 - sha256 = "1hmc9wsfgl2wmy0kccwa4brxbv02w5wiz5hrz72dsz87x1fwsah2"; 3454 - }; 3455 - hardeningDisable = [ 3456 - "bindnow" 3457 - "relro" 3458 - ]; 3459 - strictDeps = true; 3460 - nativeBuildInputs = [ pkg-config ]; 3461 - buildInputs = [ xorgproto ]; 3462 3432 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3463 3433 meta = { 3464 3434 pkgConfigModules = [ ];
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 287 287 luit, 288 288 makedepend, 289 289 pixman, 290 + sessreg, 290 291 util-macros, 291 292 xbitmaps, 292 293 xcb-proto, ··· 310 311 luit 311 312 makedepend 312 313 pixman 314 + sessreg 313 315 xbitmaps 314 316 xorgproto 315 317 xtrans
-7
pkgs/servers/x11/xorg/overrides.nix
··· 1354 1354 }; 1355 1355 }); 1356 1356 1357 - sessreg = super.sessreg.overrideAttrs (attrs: { 1358 - preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile"; 1359 - meta = attrs.meta // { 1360 - mainProgram = "sessreg"; 1361 - }; 1362 - }); 1363 - 1364 1357 xrandr = super.xrandr.overrideAttrs (attrs: { 1365 1358 postInstall = '' 1366 1359 rm $out/bin/xkeystone
-1
pkgs/servers/x11/xorg/tarballs.list
··· 13 13 mirror://xorg/individual/app/listres-1.0.6.tar.xz 14 14 mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz 15 15 mirror://xorg/individual/app/oclock-1.0.5.tar.xz 16 - mirror://xorg/individual/app/sessreg-1.1.3.tar.xz 17 16 mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz 18 17 mirror://xorg/individual/app/smproxy-1.0.7.tar.xz 19 18 mirror://xorg/individual/app/transset-1.0.3.tar.xz